Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-12-05 22:37:46 +01:00
commit 6ad3b1dccb
7 changed files with 151 additions and 56 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.6
# 6.7-next
css/uhr.css
css/uhr-black.css
@ -15,6 +15,7 @@ js/uhr.js
js/uhr-de.js
js/uhr-de_CH.js
js/uhr-de_CH_genau.js
js/uhr-dk.js
js/uhr-en.js
js/uhr-es.js
js/uhr-fr.js