Merge branch 'release/6_3_3' into 'develop'

Release/6 3 3

merge release branch into develop

See merge request !25
This commit is contained in:
Manuel Friedli 2014-09-03 15:23:57 +02:00
commit 5f6f67cfef
2 changed files with 2 additions and 3 deletions

View file

@ -1 +1 @@
6.3.2 6.3.3

View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 6.3.2 # 6.3.3
css/uhr.css css/uhr.css
css/uhr-black.css css/uhr-black.css
@ -27,7 +27,6 @@ resources/close.png
resources/favicon.png resources/favicon.png
resources/settings.png resources/settings.png
resources/uhr.woff resources/uhr.woff
showcase/index.html
COPYING COPYING
README.md README.md
VERSION VERSION