- Resolved conflicts in admin.html to keep CSS optimization changes - Regenerated package-lock.json after merge - All features from both branches are now integrated |
||
---|---|---|
.. | ||
admin.html | ||
admin.js | ||
app-google.js | ||
app-mapbox.js | ||
app.js | ||
favicon.svg | ||
index.html | ||
privacy.html | ||
style-backup.css | ||
style.css | ||
style.css.map | ||
utils.js |