lms/djangoapps · 0db4a899f41d6d60bc602f56cefa0a8e9dde496c · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into release, conflicts resolved · bdfd81d2
```
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
```
Han Su Kim committed Mar 06, 2014
bdfd81d2

Name	Last commit	Last update
..
analytics		Loading commit data...
branding		Loading commit data...
bulk_email		Loading commit data...
certificates		Loading commit data...
circuit		Loading commit data...
class_dashboard		Loading commit data...
course_wiki		Loading commit data...
courseware		Loading commit data...
dashboard		Loading commit data...
debug		Loading commit data...
django_comment_client		Loading commit data...
foldit		Loading commit data...
instructor		Loading commit data...
instructor_task		Loading commit data...
licenses		Loading commit data...
linkedin		Loading commit data...
lms_migration		Loading commit data...
multicourse		Loading commit data...
notes		Loading commit data...
notification_prefs		Loading commit data...
open_ended_grading		Loading commit data...
psychometrics		Loading commit data...
shoppingcart		Loading commit data...
static_template_view		Loading commit data...
staticbook		Loading commit data...
verify_student		Loading commit data...