Feanil Patel aa6565959d Merge branch 'release' ...

Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py

2015-05-05 16:27:45 -04:00

..

calc

Add missing __init__.py files

2015-04-30 07:43:08 -04:00

capa

Numerical Input assessment has multiple accessibilty issues

2015-05-01 23:15:33 +05:00

chem

update nltk in other parts of the platform

2015-04-08 11:28:49 -04:00

dogstats

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07:00

i18n/tests

Change how conf/locale/eo is cleaned up, so that it always happens

2015-03-24 11:18:45 -04:00

safe_lxml

Clean up tests in preparation for switching Vertical from an XModule to an XBlock

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

sandbox-packages

Adds testability to the EIA file

2015-01-13 11:01:41 -05:00

symmath

Fix unidiomatic type checking

2015-03-20 15:48:54 -04:00

xmodule

Merge branch 'release'

2015-05-05 16:27:45 -04:00