merge from dev

c7754ee4 · Akikonata · b3c6fa4b · 7aef83e0 · c7754ee4 · c7754ee4
Commit c7754ee4 authored Apr 07, 2014 by Akikonata
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

index.html dev/index.html +1 -0

index.html dist/index.html +1 -0

No files found.
--- a/dev/index.html
+++ b/dev/index.html
@@ -24,6 +24,7 @@
    <link href="../themes/default/css/import.css" type="text/css" rel="stylesheet" />
    <link href="../dialogs/dialogs.css" rel="stylesheet" type="text/css" />
    <link href="favicon.ico" type="image/x-icon" rel="shortcut icon">
+    <link href="favicon.ico" type="image/x-icon" rel="apple-touch-icon-precomposed">
 </head>

 <body>

--- a/dist/index.html
+++ b/dist/index.html
@@ -26,6 +26,7 @@

    <link rel="stylesheet" href="css/links.css" />
    <link href="favicon.ico" type="image/x-icon" rel="shortcut icon">
+    <link href="favicon.ico" type="image/x-icon" rel="apple-touch-icon-precomposed">

 </head>