Andreas Fischer d42d097244 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485

Conflicts:
	phpBB/styles/prosilver/template/forumlist_body.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html

2011-12-16 17:51:48 +01:00

..

prosilver

Merge branch 'develop-olympus' into develop

2011-12-16 17:51:48 +01:00

subsilver2

Merge branch 'develop-olympus' into develop

2011-12-16 15:50:11 +01:00