correct source dir
Merge branch 'master' of /home/services/git/netzseiten/the-world-after-systemd
+ignore +new path for ikiwiki binary

Signed-off-by: Nico Schottelius <nico@tee.schottelius.org>
Merge remote-tracking branch 'origin/master'
add resources

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
inline resources

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
correct inline directive

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
raw = yes

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
split page

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
rephrase about this site

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
linux dependency

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
+contributions

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
clarify gnome

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
Merge branch 'master' of github.com:ungleich/the-world-after-systemd

Conflicts:
	index.mdwn