phpbb/phpBB/language
Joas Schilling c49e7387d6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html
2013-11-26 11:33:17 +01:00
..
en Merge branch 'develop-olympus' into develop 2013-11-26 11:33:17 +01:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00