Tobias Reich f90bfe0086 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader ... Conflicts: assets/min/main.js		2014-05-20 17:13:45 +02:00
..
main.css	Visual enhancements for new uploader	2014-05-16 22:11:10 +02:00
main.js	Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader	2014-05-20 17:13:45 +02:00
view.js	Visual enhancements for new uploader	2014-05-16 22:11:10 +02:00