zadam 29eb5a8435 Merge branch 'stable'
# Conflicts:
#	src/services/notes.js
#	src/tools/generate_document.js
2019-12-01 10:32:30 +01:00
..
2018-09-01 15:23:51 +02:00
2019-12-01 10:32:30 +01:00
2019-12-01 10:32:30 +01:00
2019-11-24 22:15:33 +01:00
2019-10-28 20:26:40 +01:00
www
2019-08-26 20:21:43 +02:00