Merge branch 'develop' into feature/new-splashscreen

Conflicts:
	index.html
This commit is contained in:
Manuel Friedli 2014-08-26 18:25:46 +02:00
commit 851c5cbddd
25 changed files with 1151 additions and 1007 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.3
# 6.3.1
css/uhr.css
css/uhr-black.css