manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'develop' into feature/new-splashscreen

Browse source 
Conflicts:
	index.html
This commit is contained in:
Manuel Friedli 2014-06-28 14:22:49 +02:00
commit 38ba4bd14b
5 changed files with 101 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
manifest.appcache
View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 5.0.1
# 5.1
COPYING
README.md
@ -25,4 +25,4 @@ uhr.css
uhr.js
uhr.woff
info/index.html
info/info.css
info/info.css