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

Dev #5

Merged
merged 32 commits into from
Dec 16, 2015
Merged

Dev #5

merged 32 commits into from
Dec 16, 2015

Conversation

trieyouth
Copy link
Owner

login over
signup have db problem
home ui great

trieyouth and others added 30 commits December 13, 2015 13:57
implements login
make css file better
# Conflicts:
#	controllers/LoginController.php
# Conflicts:
#	controllers/LoginController.php
# Conflicts:
#	controllers/LoginController.php
# Conflicts:
#	controllers/LoginController.php
#	models/User.php
# Conflicts:
#	controllers/LoginController.php
#	models/User.php
trieyouth added a commit that referenced this pull request Dec 16, 2015
@trieyouth trieyouth merged commit 6199fa9 into master Dec 16, 2015
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