Zorchenhimer 7448876299 Merge branch 'master' into room-access-restrictions ... # Conflicts: # chatcommands.go # common/chatcommands.go # connection.go # static/css/site.css # static/main.html		2019-03-23 17:03:28 -04:00
..
chatcommands.go	Add /iplist to admin commands	2019-03-23 16:53:36 -04:00
chatdata.go	Refactoring of ChatData	2019-03-21 08:47:40 -04:00
colors.go	Add color checking and removed autoreconnect	2019-03-23 15:37:48 -04:00
constants.go	Added nick button and some cleanup	2019-03-21 23:01:21 -04:00
emotes.go	Move some stuff to MovieNight.common	2019-03-19 17:25:49 -04:00
utils.go	Add color checking and removed autoreconnect	2019-03-23 15:37:48 -04:00