Sarina Canelake 11f75e04fc Merge pull request #7512 from johnespinosa/patch-1 ...

Fixed i18n Problem with xBlock Menu

2015-03-31 12:04:52 -04:00

..

djangoapps

Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical

2015-03-31 11:10:22 -04:00

lib

Merge pull request #7512 from johnespinosa/patch-1

2015-03-31 12:04:52 -04:00

static

Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical

2015-03-31 11:10:22 -04:00

templates

Make XBlockToXModuleShim use json-init-args to record the XModule constructor to shim to

2015-03-30 16:37:53 -04:00

test

Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical

2015-03-31 11:10:22 -04:00

__init__.py

Fix Pylint: F0010(parse-error)

2015-02-19 19:56:52 -08:00

.gitignore

…