Signed-off-by: jack <jack15083@gmail.com>
Merge branch 'master' of github.com:tapatalk/tapatalk-phpbb3

Conflicts:
	install.xml