do not use submodules for tt-rss themes
remove nspages (replaced with indexmenu)
move dokuwiki plugins to additions/
add tt-rss (release 1.8) as a submodule
add imagemagick
Rebase everything on new branch
Merge branch 'master' of github.com:nodiscc/nodezero

Conflicts:
	.gitmodules
	additions/dokuwiki/lib/plugins/addnewpage
	additions/dokuwiki/lib/plugins/editx
	additions/dokuwiki/lib/plugins/indexmenu
	additions/dokuwiki/lib/plugins/markdownextra
	additions/dokuwiki/lib/plugins/orphanmedia
	additions/dokuwiki/lib/plugins/orphanswanted
	additions/dokuwiki/lib/plugins/text
	additions/dokuwiki/lib/plugins/titlesanchorlink
	additions/dokuwiki/lib/plugins/upgrade
add https://github.com/Chris--S/dokuwiki-plugin-xbr as submodule
add baselink plugin from https://www.dokuwiki.org/plugin:baselink
wiki update
update tt-rss to 1.9
Merge branch 'master' into shaarli-backup-script

Conflicts:
	wwwroot/tt-rss