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
..
css.h	Fixed #27 DST not taken into account	2018-04-29 11:01:59 +02:00
html.h	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00
js.h	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00
version.h	Merge branch 'release/2.1'	2018-04-29 11:06:17 +02:00