Skip to content

Lucy backup#7

Open
MatildaTeitzel wants to merge 3 commits intodevfrom
lucy-backup
Open

Lucy backup#7
MatildaTeitzel wants to merge 3 commits intodevfrom
lucy-backup

Conversation

@MatildaTeitzel
Copy link
Collaborator

No description provided.

MatildaTeitzel and others added 3 commits January 12, 2017 01:59
Merge branch 'dev' of https://github.com/ncss/projects-2017-3 into lucy-backup

# Conflicts:
#	backend/ask.py
#	backend/view.py
#	templates/view_question.html
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.

1 participant