Files · 84b85443c1c5fe983ee6ad4f73d7f6e1807cf792 · edx / edx-ora2

Merge branch 'authoring' of https://github.com/edx/edx-ora2 into… · 84b85443

Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/sass/oa/utilities/_developer.scss

committed Jul 14, 2014

84b85443

Name	Last commit	Last update
.tx		Loading commit data...
conf		Loading commit data...
docs/en_us		Loading commit data...
logs		Loading commit data...
openassessment		Loading commit data...
performance		Loading commit data...
requirements		Loading commit data...
scripts		Loading commit data...
settings		Loading commit data...
storage		Loading commit data...
vagrant		Loading commit data...
.coveragerc		Loading commit data...
.gitignore		Loading commit data...
.travis.yml		Loading commit data...
AUTHORS		Loading commit data...
LICENSE		Loading commit data...
MANIFEST.in		Loading commit data...
README.rst		Loading commit data...
Vagrantfile		Loading commit data...
apt-packages.txt		Loading commit data...
karma.conf.js		Loading commit data...
manage.py		Loading commit data...
package.json		Loading commit data...
pylintrc		Loading commit data...
setup.py		Loading commit data...
urls.py		Loading commit data...

README.rst