zadam 7105b61aab Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/javascripts/desktop.js
#	src/views/desktop.ejs
#	src/views/mobile.ejs
2020-03-07 22:21:55 +01:00
..
2020-03-07 21:34:39 +01:00
2019-06-30 20:14:57 +02:00