Calen Pennington c72b0bb293 Resolve merge conflicts relative to master

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

..

contentstore

Resolve merge conflicts relative to master

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

course_creators

Replace authz fns with roles.py ones

2014-01-14 17:04:44 -05:00

models

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

2014-05-07 12:56:43 -04:00