Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-09-03 15:31:04 +02:00
commit a0ca6228e2
12 changed files with 32 additions and 85 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.3.1
# 6.3.3
css/uhr.css
css/uhr-black.css
@ -27,7 +27,6 @@ resources/close.png
resources/favicon.png
resources/settings.png
resources/uhr.woff
showcase/index.html
COPYING
README.md
VERSION