Marc Alexander da9888d04f Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html

2014-09-01 22:46:08 +02:00

..

template

Merge pull request #2887 from Pico/ticket/12991

2014-09-01 22:43:54 +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