Mark van Renswoude 3af8ec5925 Merge branch 'release/2.1' ... # Conflicts: # src/assets/version.h # src/main.cpp # web/dist/bundle.js		2018-04-29 11:06:17 +02:00
..
dist	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00
app.js	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00
index.html	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00
lang.js	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00
logo.ai	Changed from UDP to HTTP	2018-01-01 19:56:07 +01:00
logo.png	Changed from UDP to HTTP	2018-01-01 19:56:07 +01:00
site.scss	Fixed #27 DST not taken into account	2018-04-29 11:01:59 +02:00
variables.scss	Finished restyling	2018-01-23 15:07:12 +01:00