Brandon Taylor 34e5d62245 Fixed merge conflict.		2014-12-22 10:30:56 -05:00
..
app	Fixed merge conflict.	2014-12-22 10:30:56 -05:00
database	Merged pull request 97	2014-12-22 10:25:35 -05:00
sample_project	Merged pull request 97	2014-12-22 10:25:35 -05:00
manage.py	Version bump to 1.7.1.	2014-08-21 22:14:36 -04:00