Merge branch 'master' into quizzes
[oweals/karmaworld.git] / karmaworld / settings / vmdev.py
2014-01-17 BryanMerge remote-tracking branch 'origin' into feature_html...
2014-01-17 Bryanmore copy pasta synchronization
2014-01-17 Bryansynchronzing vmdev with prod because copypasta.
2014-01-16 Bryanweird merge problem?
2014-01-15 BryanMerge branch 'django155' of github.com:FinalsClub/karma...
2014-01-14 Bryanfixes and docs for VM to be more friendly for testing.