Steffen 8bd3c9b450 Merge branch 'main' into custom-images ... # Conflicts: # CHANGELOG.md		2021-02-08 13:58:27 +01:00
..
modals	Merge branch 'main' into custom-images	2021-02-08 13:58:27 +01:00
Gradients.vue	added vote locking and styling	2020-06-04 18:23:33 +02:00
Intro.vue	added disclaimer	2020-12-05 22:46:05 +01:00
Menu.vue	changed code to grab session id from pasted domain in join dialog to be a pop, to avoid errors if the hash string is not present	2021-02-05 22:12:59 +01:00
Player.vue	show generic icons for custom roles and opt out players	2021-02-04 21:40:59 +01:00
Token.vue	show generic icons for custom roles and opt out players	2021-02-04 21:40:59 +01:00
TownInfo.vue	re-enabled custom role support	2021-02-03 22:12:38 +01:00
TownSquare.vue	added touch styling	2020-12-27 21:22:17 +01:00
Vote.vue	fix race condition causing audible countdown	2021-01-07 21:42:28 +01:00