antelle 177b150c95 Merge branch 'master' into develop ... # Conflicts: # app/templates/export/entry.hbs # release-notes.md		2020-05-15 20:52:16 +02:00
..
db.hbs	Merge branch 'master' into develop	2020-05-15 20:52:16 +02:00
entry.hbs	Merge branch 'master' into develop	2020-05-15 20:52:16 +02:00