Emanuel Schütze b297bab5b5 Fix merge conflict in core/base.js		2016-11-02 22:05:07 +01:00
..
css	Merge pull request #2516 from FinnStutzenstein/Issue2502	2016-10-17 21:48:34 +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	Fix merge conflict in core/base.js	2016-11-02 22:05:07 +01:00
templates	Fixed translation issues.	2016-11-01 23:32:39 +01:00