common/lib · 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
..
calc		Loading commit data...
capa		Loading commit data...
chem		Loading commit data...
sandbox-packages		Loading commit data...
symmath		Loading commit data...
xmodule		Loading commit data...
django_startup.py		Loading commit data...
extract_tar.py		Loading commit data...
html_to_text.py		Loading commit data...
logsettings.py		Loading commit data...
rooted_paths.py		Loading commit data...
sample-post.py		Loading commit data...
supertrace.py		Loading commit data...
tempdir.py		Loading commit data...