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

..

api

Merge branch 'master' into next50

2022-01-09 20:18:30 +01:00

custom.js

backend import unification

2021-06-29 22:15:57 +02:00

electron.js

fixed "duplicate subtree"

2021-02-14 11:43:31 +01:00

index.js

add memberId to entity_changes to avoid having to resend all changes second time

2022-01-09 20:16:39 +01:00

login.js

resetting/setting password from options

2021-12-30 22:54:08 +01:00

routes.js

add memberId to entity_changes to avoid having to resend all changes second time

2022-01-09 20:16:39 +01:00

setup.js

syncification

2020-06-20 12:31:38 +02:00