Tobias Reich b8630538f3 Merge branch 'master' into uploader ... Conflicts: assets/min/main.css assets/min/main.js assets/min/view.js		2014-07-23 20:30:53 +02:00
..
main.css	Merge branch 'master' into uploader	2014-07-23 20:30:53 +02:00
main.js	Merge branch 'master' into uploader	2014-07-23 20:30:53 +02:00
view.js	Merge branch 'master' into uploader	2014-07-23 20:30:53 +02:00