Merge branch 'master' into 'develop'

Master See merge request !124

Merge branch 'master' into 'develop'
Master See merge request !124
Eric Fernandez
2 parents c90d24150d 19e1475f5f
Showing 2 changed files Show diff stats
img/favicon.png
index.html
@@ -12,8 +12,7 @@
         <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"/>
         <link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/>
         <link href="./css/general.css" rel="stylesheet"/>
-        <link rel="shortcut icon" href="./img/favicon.ico" />
-
+        <link rel="shortcut icon" href="./img/favicon.png" />
  
         <!--VENDOR JS-->
         <script src="./node_modules/jquery/dist/jquery.min.js"></script>
...	...	@@ -12,8 +12,7 @@
12	12	<link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"/>
13	13	<link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/>
14	14	<link href="./css/general.css" rel="stylesheet"/>
15		- <link rel="shortcut icon" href="./img/favicon.ico" />
16		-
	15	+ <link rel="shortcut icon" href="./img/favicon.png" />
17	16
18	17	<!--VENDOR JS-->
19	18	<script src="./node_modules/jquery/dist/jquery.min.js"></script>