Adam 58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts ...

Adam/resolve merge conflicts

2014-09-05 14:55:24 -04:00

..

djangoapps

Merge pull request #5107 from edx/adam/resolve-merge-conflicts

2014-09-05 14:55:24 -04:00

envs

Revert "AWS settings for XBlocks to have filesystem-like storage"

2014-09-02 11:29:59 -04:00

lib

Add post type control to forum new post form

2014-08-29 15:59:32 -04:00

static

Merge pull request #5105 from edx/talbs/os-ggg-a11y

2014-09-05 13:57:57 -04:00

templates

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

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

__init__.py

…

.coveragerc

…

startup.py

Merge pull request #4915 from edx/flowerhack/redo-third-party

2014-08-30 02:50:57 -04:00

tests.py

Add missing mimetypes for xblock resources

2014-05-29 11:14:00 -04:00

urls.py

Updating the footer for edx.org and open edx.

2014-08-25 15:33:43 +00:00

wsgi_apache_lms.py

…

wsgi.py

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00