Tobias Reich c482ebdd74 Merge branch 'master' into uploader ... Conflicts: assets/min/main.js assets/min/view.js		2014-08-07 20:25:33 +02:00
..
main.css	Fixed broken upload status style in Firefox	2014-07-26 16:57:21 +02:00
main.js	Fixed "No way to back out during database creation #195"	2014-08-07 20:23:39 +02:00
view.js	Fixed "If EXIF data is missing, don't show them in the info #194"	2014-08-06 17:07:12 +02:00