phpbb/phpBB/styles
Andreas Fischer a97d9d4b89 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
2013-05-06 22:11:33 +02:00
..
prosilver Merge branch 'develop-olympus' into develop 2013-05-06 22:11:33 +02:00
subsilver2 Merge branch 'develop-olympus' into develop 2013-05-06 22:11:33 +02:00