Merge remote-tracking branch 'edx/master' into ok-merge-from-master

This commit is contained in:
Calen Pennington
2014-05-23 10:05:56 -04:00
63 changed files with 1602 additions and 650 deletions

View File

@@ -18,10 +18,7 @@ in the process of introducing other changes.
To check the quality of your pull request, just go to the top level of the
edx-platform codebase and run::
$ paver run_quality
Note: The rake commands ``rake quality``, ``rake pep8``, and ``rake pylint`` are now deprecated
to ``paver run_quality``, ``paver run_pep8``, and ``paver run_pylint`` respectively.
$ rake quality
This will print a report of the quality violations that your branch has made.