Andreas Fischer 3cc0a4149f Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11789] Remove inline color in memberlist_view

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_view.html

2013-08-18 17:10:26 +02:00

..

template

Merge branch 'develop-olympus' into develop

2013-08-18 17:10:26 +02:00

theme

Merge branch 'develop-olympus' into develop

2013-08-18 17:10:26 +02:00

style.cfg

[develop-olympus] Bumping version numbers to final for 3.0.12 releases.

2013-07-12 21:10:05 +02:00