Calen Pennington c72b0bb293 Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

..

management

Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

migrations

sending template pdf with certificate request

2013-11-15 13:35:54 -05:00

__init__.py

Added check to make sure utf8 migration only runs on mysql. Had to add in certificates module.

2012-07-11 16:33:46 -04:00

models.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

queue.py

Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

views.py

Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00