zadam f4a4e746bf Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js.map
#	package.json
#	src/routes/api/login.js
#	src/routes/api/sync.js
#	src/routes/index.js
#	src/services/app_info.js
#	src/services/sync.js
2020-08-02 20:41:22 +02:00
..
2020-05-27 00:09:51 +02:00
2020-07-24 22:03:39 +02:00
2020-06-14 14:30:57 +02:00
2020-07-14 23:29:37 +02:00
2020-07-04 10:18:01 +02:00
2020-07-24 23:14:31 +02:00
2020-07-24 00:02:15 +02:00
2020-07-24 23:14:31 +02:00