radu/Django-Hackathon-Starter: A boilerplate application for Django web applications. @ 797bc7c7ed16d4732a7d5cec70e1bb57af79cb58

David Leonard 66de6d9aae Merging Marco's pull request		11 éve
..
__init__.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	11 éve
testcase.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	11 éve
testgithub.py	bc5fad0b55 Restoring Github tests and coverage to 100%	11 éve
teststeam.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	11 éve
testtumblr.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	11 éve