Calen Pennington c72b0bb293 Resolve merge conflicts relative to master

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

..

__init__.py

move instructor views.py to views/legacy.py

2013-08-02 09:52:11 -04:00

api_urls.py

Batch add/remove beta testers on beta dash

2014-03-18 16:08:59 -04:00

api.py

Resolve merge conflicts relative to master

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

instructor_dashboard.py

Resolve merge conflicts relative to master

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

legacy.py

Resolve merge conflicts relative to master

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

tools.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00