Finn Stutzenstein 78ec30d6b2 Handle duplicates during user import		2016-08-31 12:23:38 +02:00
..
css	Handle duplicates during user import	2016-08-31 12:23:38 +02:00
fonts	Fix syntax and style errors and errors after deficient merge conflic	2014-04-08 21:02:09 +02:00
img	Reduce sizes of used logos.	2016-04-13 11:06:50 +02:00
js/core	Line numbers and inline editing	2016-08-20 11:18:17 +02:00
templates	Merge pull request #2261 from emanuelschuetze/config-translations	2016-08-09 20:18:49 +02:00