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

Hotfix/editable survey forms #68

Open
wants to merge 60 commits into
base: master
Choose a base branch
from

Conversation

kristenhazard
Copy link
Collaborator

No description provided.

oneillkai and others added 30 commits April 2, 2020 12:15
…able-survey-forms

# Conflicts:
#	Gemfile.lock
#	lib/hanuman/version.rb
…rd/hanuman into hotfix/editable-survey-forms
…able-survey-forms

# Conflicts:
#	Gemfile.lock
#	lib/hanuman/version.rb
oneillkai and others added 30 commits June 23, 2020 10:03
…/editable-survey-forms

# Conflicts:
#	Gemfile.lock
#	app/assets/stylesheets/hanuman/hanuman-admin.scss
#	app/models/hanuman/question.rb
#	frontend/app/templates/components/question-modal.hbs
#	frontend/app/templates/components/questions-list.hbs
#	frontend/package-lock.json
#	frontend/yarn.lock
#	lib/hanuman/version.rb
…fix/editable-survey-forms

# Conflicts:
#	lib/hanuman/version.rb
…fix/editable-survey-forms

# Conflicts:
#	lib/hanuman/version.rb
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.

None yet

2 participants