Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing ... # Conflicts: # client/config/dev.env.js # client/config/prod.env.js # client/cypress/fixtures/schema.json # client/cypress/integration/beta-login.spec.js # client/package-lock.json # client/src/graphql/client.js # client/src/layouts/PublicLayout.vue # client/src/main.js # client/src/styles/main.scss # server/core/settings.py # server/registration/mutations_public.py # server/users/factories.py # server/users/models.py # server/users/schema.py		2020-04-30 15:22:55 +02:00
..
fixtures	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
integration	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
plugins	Add cypress test runner and some initial e2e tests	2018-10-23 13:39:46 +02:00
support	Fix Beta Login	2020-03-09 16:41:17 +01:00