Christian Cueni d95e8ca492 Merge branch 'develop' into feature/licensing ... # Conflicts: # Pipfile.lock # client/cypress/fixtures/schema.json # client/src/graphql/client.js # client/src/graphql/resolvers.js # client/src/graphql/typedefs.js # client/src/main.js # client/src/router/index.js # server/users/models.py		2020-02-27 10:29:24 +01:00
..
registration	Add tag for link generation	2020-02-25 10:28:57 +01:00
wagtailadmin	Update naming to be more consistent	2019-09-12 14:28:57 +02:00
base.html	Remove graphql password reset, style django pages	2019-10-08 09:30:00 +02:00
confirmation_key.html	Fix email verification for stage	2020-02-13 11:28:23 +01:00
generic_page.html	initial commit	2018-08-06 23:26:23 +02:00