Calen Pennington 6c546fbf1f Fix merge conflicts

2014-05-13 15:31:40 -04:00

..

__init__.py

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

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

test_dashboard_data.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_views.py

Change URL patterns for instructor dashboard

2014-05-12 10:18:28 -04:00