lychee/assets
Tobias Reich 13dca6cb48 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/min/main.css
	assets/min/main.js
	assets/min/view.js
2014-06-21 12:23:19 +02:00
..
css Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader 2014-06-21 12:23:19 +02:00
font V2.0 2014-01-22 11:12:51 +01:00
img Moved favicon to the root 2014-02-15 21:30:59 +01:00
js Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader 2014-06-21 12:23:19 +02:00
min Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader 2014-06-21 12:23:19 +02:00