Ulf Gebhardt 77dc54155a
Merge branch 'master' into backend_rights
# Conflicts:
#	admin/src/router/guards.js
#	admin/src/store/store.js
#	backend/src/graphql/resolver/UserResolver.ts
#	frontend/src/components/SidebarPlugin/SideBar.vue
#	frontend/src/graphql/queries.js
#	frontend/src/routes/guards.js
2021-11-25 08:49:06 +01:00
..
2021-11-17 16:58:04 +01:00
2021-10-06 11:52:43 +02:00
2021-06-29 12:25:42 +02:00
2021-10-18 15:38:43 +02:00
2021-11-17 16:56:13 +01:00
2021-11-17 16:56:13 +01:00