Skip to content

Commit 1b0cb81

Browse files
committed
Merge branch 'master' into domoticz/master
# Conflicts: # www/html5.appcache
2 parents 0c2d0ed + 4ac32d8 commit 1b0cb81

File tree

9 files changed

+114
-85
lines changed

9 files changed

+114
-85
lines changed

www/html5.appcache

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,23 @@ images/evohome/RemoteOverride.png
361361
images/evohome/RemoteOverrideInv.png
362362
images/evohome/TemporaryOverride.png
363363
images/evohome/TemporaryOverrideInv.png
364+
images/logo/152.png
365+
images/logo/144.png
366+
images/logo/76.png
367+
images/logo/72.png
368+
images/logo/180.png
369+
images/logo/114.png
370+
images/logo/57.png
364371
images/startup/apple-touch-startup-image-1024x748.png
365372
images/startup/apple-touch-startup-image-1536x2008.png
366373
images/startup/apple-touch-startup-image-2048x1496.png
367374
images/startup/apple-touch-startup-image-320x460.png
368375
images/startup/apple-touch-startup-image-640x1096.png
369376
images/startup/apple-touch-startup-image-640x920.png
370377
images/startup/apple-touch-startup-image-768x1004.png
378+
images/startup/apple-touch-startup-image-750x1294.png
379+
images/startup/apple-touch-startup-image-1242x2148.png
380+
images/startup/apple-touch-startup-image-2208x1182.png
371381
media/1x1.gif
372382
media/handclosed.cur
373383
media/handopen.cur

www/images/logo/114.png

7.77 KB
Loading

www/images/logo/144.png

10 KB
Loading

www/images/logo/152.png

10.7 KB
Loading

www/images/logo/180.png

13.1 KB
Loading

www/images/logo/57.png

4.1 KB
Loading

www/images/logo/72.png

5.05 KB
Loading

www/images/logo/76.png

5.26 KB
Loading

0 commit comments

Comments
 (0)