Commit graph

3 commits

Author SHA1 Message Date
1cd2719833
Merge branch 'develop' into feature/#94-auto-resume-after-screenshot
# Conflicts:
#	src/javascript/index.js
#	src/stylesheets/aniwatchplus.scss
#	src/stylesheets/enhancements/_watch2gether.scss
2020-10-28 17:34:18 +01:00
bfb64887ea
#90 Add styles to fix icon position for room creator 2020-10-25 13:16:50 +01:00
3125e6720f
#91 Added base implementation for chat counter
Adds uuid dependency to create guids
2020-10-25 12:47:32 +01:00