Chris Dodge 08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 ...

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py

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

..

admin

perform a new merge from master, resolve conflicts

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

coffee

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

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

contrib

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

css/vendor

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

files

Add content and assets for media kit

2013-01-03 13:28:45 -05:00

fonts

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

images

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

2013-01-07 12:34:48 -05:00

js

perform a new merge from master, resolve conflicts

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

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

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

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

scripts

perform a new merge from master, resolve conflicts

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

staff

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

green-pointer.png

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

pixel.jpg

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00