Merge branch 'master' of https://github.com/geekwright/gwiki · geekwright/gwiki@ad63258 · GitHub

Commit

Merge branch 'master' of https://github.com/geekwright/gwiki

Browse files

# Conflicts:
#	class/gwikiPage.php
#	wizard.php
#	xoops_version.php

Loading branch information

mambax7 committed Apr 5, 2016

2 parents c963bfa + 1a95159 commit ad63258