Calen Pennington fc2d5c43f1 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	lms/envs/aws.py

2013-01-14 12:51:19 -05:00

..

djangoapps

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -05:00

envs

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-14 12:51:19 -05:00

lib

symmath use https, no server cert verify

2013-01-05 12:29:03 -05:00

static

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -05:00

templates

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -05:00

__init__.py

…

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -05:00

wsgi.py

…