Norman Jäckel 31e47e0ac5 Merge pull request #2308 from FinnStutzenstein/Issue1213 ... Handle duplicates during user import (fixes #1213)		2016-08-31 13:05:03 +02:00
..
css	Merge pull request #2308 from FinnStutzenstein/Issue1213	2016-08-31 13:05:03 +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	Added search filtering by category (fixes #2019, fixes #2239)	2016-08-25 17:49:36 +02:00
templates	Added search filtering by category (fixes #2019, fixes #2239)	2016-08-25 17:49:36 +02:00