Brian Jacobel e8d2a626d4 Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master ...

Fix release 2016 05 10 merge conflicts with master

2016-05-10 13:03:19 -04:00

..

acceptance

Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master

2016-05-10 13:03:19 -04:00

data

add discussion_id to course structure dump command (AN-6696)

2016-05-09 11:24:37 -04:00

db_cache

Refresh DB caches.

2016-04-01 21:06:08 +00:00

db_fixtures

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

templates

dummy theme templates for testing

2014-06-26 10:37:58 -04:00

test_microsites

Render LMS main navigation (tabs) with template, override templates for a specific list item

2016-02-16 17:03:53 +03:00

__init__.py

Run pylint on all our code, and only our code. TE-855

2015-05-04 15:23:55 -04:00

utils.py

Fix enrollment message

2016-01-20 15:59:27 +05:00