Adam Palay bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/github.txt

2015-01-30 09:44:42 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-01-30 09:44:42 -05:00

lib

Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl

2015-01-30 09:12:56 -05:00

static

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-01-30 09:44:42 -05:00

templates

Upgrade MathJax to 2.4.

2015-01-19 08:10:45 +01:00

test

Merge pull request #6720 from edx/renzo/remove-split-verification-session-flag

2015-01-29 16:57:40 -05:00

.gitignore

…