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
..
template	Merge branch 'develop-olympus' into develop	2012-04-04 15:33:51 -04:00
theme	[feature/merging-style-components] Removing theme.cfg and template.cfg	2012-03-14 23:26:01 +02:00
style.cfg	[feature/merging-style-components] Adding template information to style.cfg	2012-03-14 23:26:23 +02:00