Merge branch 'master' into feature/new-splashscreen

Browse source

Conflicts:
	manifest.appcache

...

This commit is contained in:

Manuel Friedli 2014-08-26 17:06:02 +02:00

parent ab0d78ae18 f576347c06

commit 5924f43d99

45 changed files with 12424 additions and 1032 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

resources/apple-touch-icon-precomposed.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

resources/close.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 407 B

BIN

resources/favicon.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 664 B

BIN

resources/settings.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 435 B

BIN

resources/uhr.woff Normal file

View file

Binary file not shown.