-
Jonny Bradley authored
Conflicts occurred on lib/wiki-plugins/wikiplugin_footnote.php Hopefully fixed ok manually, sorry no time to test...
26e4b7f6
Conflicts occurred on lib/wiki-plugins/wikiplugin_footnote.php Hopefully fixed ok manually, sorry no time to test...