Norman Jäckel 78077e4ab1 Fix syntax and style errors and errors after deficient merge conflic ... resolving after branch merging.		2014-04-08 21:02:09 +02:00
..
css	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
fonts	Fix syntax and style errors and errors after deficient merge conflic	2014-04-08 21:02:09 +02:00
img	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
js	Merge part of stable/1.5.x into master.	2014-04-08 20:33:07 +02:00