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

Quickfix #33

Merged
merged 1 commit into from
Nov 3, 2016
Merged

Quickfix #33

merged 1 commit into from
Nov 3, 2016

Conversation

willsimmons
Copy link

adjusted for warning on login and sign in pages

@willsimmons willsimmons changed the base branch from master to develop November 3, 2016 00:11
@trautlein trautlein merged commit a8b87fd into newtonian-platypus:develop Nov 3, 2016
mwnachman pushed a commit to mwnachman/piddle that referenced this pull request Nov 3, 2016
…ndpoints (newtonian-platypus#33)

* Fix merge conflicts

* Add bcrypt and session config

* Add packages

* Add local strategy

* Implement user controller

* Add placeholder response

* Implement authentication routes

* Fix conflicts

* Fix conflicts
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