mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
php-phpbb/phpBB/language
History
Nathan Guse 052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 
* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board

Conflicts:
	phpBB/language/en/acp/board.php
2014-03-10 21:51:07 -05:00
..
en
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
2014-03-10 21:51:07 -05:00
index.htm
…