zadam 96f4230bc1 Merge branch 'master' into next50 ... # Conflicts: # src/public/app/widgets/containers/root_container.js # src/services/app_info.js		2022-01-09 20:18:30 +01:00
..
migrations	Merge branch 'master' into next50	2022-01-09 20:18:30 +01:00
demo.zip	fix importing notePosition of directories	2021-10-08 22:31:35 +02:00
image-deleted.png
schema.sql	add memberId to entity_changes to avoid having to resend all changes second time	2022-01-09 20:16:39 +01:00
TODO.txt