resolution du merge

.gitlab-ci.yml

README.md

db/migrations/20180225001319_create_groups.js

db/migrations/20180301152556_group_parent_key.js

db/seeds/01_create_groups.js

ldap_config.json

src/graphql/schema.js

src/ldap/ldap_auth.js

src/ldap/ldap_data.js