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
	manifest.appcache
This commit is contained in:
Manuel Friedli 2014-06-28 02:14:50 +02:00
commit 4360f5aee1
5 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
index.html
View file

@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<link rel="stylesheet" type="text/css" href="uhr-green.css" />
<link rel="stylesheet" type="text/css" href="uhr-red.css" />
<link rel="stylesheet" type="text/css" href="uhr-white.css" />
<link rel="stylesheet" type="text/css" href="uhr-pink.css" />
<link rel="shortcut icon" type="image/png" href="favicon.png" />
<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
<link rel="apple-touch-startup-image" href="startup-320x460.png" media="screen and (max-device-width : 320px)" />