Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-06-30 15:49:02 +02:00
commit cbbe2e103d
11 changed files with 244 additions and 88 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.0
# 6.2.1
COPYING
README.md
@ -18,7 +18,9 @@ uhr-de.js
uhr-de_CH.js
uhr-de_CH_genau.js
uhr-en.js
uhr-fr.js
uhr-green.css
uhr-it.js
uhr-pink.css
uhr-red.css
uhr-white.css