Calen Pennington feef179e3e Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing ...

Conflicts:
	cms/envs/common.py

2012-06-29 12:11:35 -04:00

..

capa

Added styles for more basic html elements and reworked design of textinput

2012-06-21 15:41:36 -04:00

keystore

Parse XModuleDescriptors on import using from_xml

2012-06-26 11:56:21 -04:00

mitxmako

Minor fixes from pull request 131

2012-06-28 08:39:12 -04:00

xmodule

Parse more module types as sequence modules

2012-06-26 14:29:30 -04:00