Calen Pennington 240fcc1d5a Fix merge conflicts

2014-05-22 16:24:02 -04:00

..

models

Convert tabs to RESTful URL.

2013-11-21 10:19:43 -05:00

utils

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

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

video

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

views

Fix merge conflicts

2014-05-22 16:24:02 -04:00