Joas Schilling 11c9d11482 Merge branch 'develop-ascraeus' into develop		2014-11-22 15:43:33 +01:00
..
default	Merge branch 'develop-ascraeus' into develop	2014-11-22 15:43:33 +01:00
development	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
production	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
test	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00