Merge branch 'develop' into feature/new-splashscreen
Conflicts: index.html
This commit is contained in:
commit
851c5cbddd
25 changed files with 1151 additions and 1007 deletions
|
@ -1,5 +1,5 @@
|
|||
CACHE MANIFEST
|
||||
# 6.3
|
||||
# 6.3.1
|
||||
|
||||
css/uhr.css
|
||||
css/uhr-black.css
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue