Tobias Reich 7299637397 Merge branch 'master' into uploader ... Conflicts: assets/min/main.css		2014-07-26 15:59:19 +02:00
..
main.css	Fixed missing background of error message	2014-07-26 15:58:49 +02:00
main.js	Merge fix	2014-07-26 15:54:48 +02:00
view.js	Merge fix	2014-07-23 20:31:20 +02:00