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

CapstoneProject #2

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

Conversation

vincezipparro
Copy link

No description provided.

AdamKozlowski01 and others added 30 commits June 8, 2016 00:45
# Conflicts:
#	views/default/index.html
# Conflicts:
#	controllers/default.py
full chat
This reverts commit e0326c7.
full chat
# Conflicts:
#	controllers/default.py
#	controllers/default.py.bak
#	models/db.py
#	models/db1.py
#	static/css/custom.css
#	views/default/index.html
#	views/layout.html
# Conflicts:
#	controllers/default.py
#	controllers/default.py.bak
#	models/db.py
#	models/db1.py
#	static/css/custom.css
#	views/default/index.html
#	views/layout.html
chat complete
# Conflicts:
#	default.py
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.

5 participants