Merge branch 'release/6.6' into 'develop'

Release/6.6

See merge request !33
This commit is contained in:
Manuel Friedli 2014-12-05 20:52:48 +01:00
commit 78eea9ac1e
2 changed files with 2 additions and 2 deletions

View file

@ -1 +1 @@
6.5-next 6.6

View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 6.5-next # 6.6
css/uhr.css css/uhr.css
css/uhr-black.css css/uhr-black.css