Marius Hein 5df14b41e1 Merge branch 'feature/build-server-integration-4067' ... Conflicts: .gitignore		2013-06-04 11:40:20 +02:00
..
frontend	Move tested existing resources to new productive repository	2013-06-04 10:20:51 +02:00
javascript	Move tested existing resources to new productive repository	2013-06-04 10:20:51 +02:00
js	Fix: Style-checkers report their output to wrong location	2013-06-03 16:07:52 +02:00
php	Merge branch 'feature/build-server-integration-4067'	2013-06-04 11:40:20 +02:00