Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-12-08 00:00:49 +01:00
commit fca1b5a01a
3 changed files with 38 additions and 2 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.7-next
# 7.0-next
css/uhr.css
css/uhr-black.css