error
errors
Merge branch 'master' of https://github.com/riteshsamala/forum

Conflicts:
	adm/create_forum.php
Merge branch 'master' of https://github.com/riteshsamala/forum