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
..
fixtures	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
integration	Merge branch 'develop' into feature/licensing	2020-02-27 10:29:24 +01:00
plugins	Add cypress test runner and some initial e2e tests	2018-10-23 13:39:46 +02:00
support	Remove hep id as default	2020-02-18 16:57:36 +01:00