Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-12-05 21:06:59 +01:00
commit e5b9ab35aa
7 changed files with 174 additions and 4 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.4
# 6.6
css/uhr.css
css/uhr-black.css
@ -16,8 +16,10 @@ js/uhr-de.js
js/uhr-de_CH.js
js/uhr-de_CH_genau.js
js/uhr-en.js
js/uhr-es.js
js/uhr-fr.js
js/uhr-it.js
js/uhr-nl.js
lib/jquery-2.1.0.min.js
lib/jquery-cookie-1.4.0.js
lib/jquery-ui-1.10.4.custom.min.js