Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/dao #8

Merged
merged 34 commits into from
Apr 27, 2017
Merged

Feature/dao #8

merged 34 commits into from
Apr 27, 2017

Conversation

nathan-K-
Copy link
Owner

No description provided.

Naima H and others added 30 commits April 19, 2017 02:46
qques chgts ds node
# Conflicts:
#	back-end/Docker/create_table.sql
# Conflicts:
#	back-end/Docker/insert_datas.sql
(warning, json seems to be invalid...)
HLNaima and others added 4 commits April 25, 2017 23:34
# Conflicts:
#	back-end/docbox/content/example.md
#	back-end/nodejs/OO_Coi.js
#	back-end/nodejs/OO_Parcours.js
#	back-end/nodejs/index.js
#	back-end/nodejs/lib.js
#	back-end/nodejs/package.json
#	back-end/nodejs/pgDAO.js
@HLNaima HLNaima merged commit 81ee704 into develop Apr 27, 2017
@nathan-K- nathan-K- deleted the feature/dao branch April 27, 2017 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants