Steffen 863c2137a6 Merge branch 'master' into voting ... # Conflicts: # src/components/Menu.vue		2020-06-04 21:57:18 +02:00
..
modules	vote timer	2020-06-03 23:04:50 +02:00
index.js	Merge branch 'master' into voting	2020-06-04 21:57:18 +02:00
persistence.js	modularized session	2020-05-30 22:47:42 +02:00
socket.js	vote timer	2020-06-03 23:04:50 +02:00