Jeremy Bowman 2b7866bfc1 Merge pull request #12886 from edx/release-2016-06-28-conflict ...

Merge release into master

2016-06-28 16:19:50 -04:00

..

djangoapps

Merge pull request #12667 from edx/kkim/tz_pref_AS

2016-06-28 13:10:10 -04:00

djangolib

Fix import order for HTML, Text.

2016-05-23 08:47:08 -04:00

lib

Update BlockStructure version number

2016-06-27 11:15:07 -04:00

__init__.py

Document the Open edX package.

2014-12-08 13:28:47 -05:00

operations.py

mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations

2015-10-19 10:11:59 -04:00

storage.py

WIP: xblock pipeline work (#10176)

2016-04-29 10:52:42 -04:00