zadam 9a5a085103 Merge branch 'stable'
# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/server.js
#	src/services/app_info.js
#	src/services/notes.js
2019-03-30 22:11:03 +01:00
..
2019-03-30 22:11:03 +01:00
2019-02-20 23:07:57 +01:00
2019-03-27 21:04:25 +01:00