Marc Alexander f7d41c8465 Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/ucp_header.html		2014-09-05 21:07:02 +02:00
..
template	Merge pull request #2868 from rxu/ticket/12969	2014-09-05 21:05:33 +02:00
theme	Merge remote-tracking branch 'PayBas/ticket/12506' into develop-ascraeus	2014-08-25 13:13:25 -07:00
style.cfg	[ticket/12974] Update nightly build version to 3.2.0-a1-dev	2014-08-12 10:56:20 +02:00