Oleg Pudeyev 7d6b289671 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php

2012-04-04 15:33:51 -04:00

..

images

[ticket/10270] Changing close button for ajax popups

2012-03-31 02:10:16 +02:00

style

Merge branch 'develop-olympus' into develop

2012-04-04 15:33:51 -04:00

index.php

[ticket/10607] Added 'Powered by' translation string.

2012-04-04 11:38:15 +08:00

swatch.php

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

2011-12-31 13:32:52 +00:00