Andreas Fischer 50d234b9af Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.

Conflicts:
	phpBB/styles/prosilver/template/memberlist_leaders.html

2012-02-28 22:25:09 +01:00

..

template

Merge branch 'develop-olympus' into develop

2012-02-28 22:25:09 +01:00

theme

Merge branch 'develop-olympus' into develop

2012-02-28 22:25:09 +01:00

style.cfg

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00