mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
php-phpbb/phpBB/language
History
Nathan Guse 4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
2012-10-16 23:33:57 -05:00
..
en
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
2012-10-16 23:33:57 -05:00
index.htm
…