Toby Lawrence
|
e2b8df7ec6
|
Clear out usages of deprecated vendor prefixes.
|
2016-03-15 11:57:38 -04:00 |
|
David Baumgold
|
1388684194
|
Sass 3.2.9, Bourbon 3.1.8
|
2013-07-10 09:17:58 -04:00 |
|
Chris Dodge
|
3b5e17ef55
|
Merge branch 'master' into feature/cdodge/cms-master-merge2
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
|
2013-01-07 12:34:48 -05:00 |
|
Chris Dodge
|
7229a9cdaf
|
perform a new merge from master, resolve conflicts
|
2013-01-03 10:43:03 -05:00 |
|
Calen Pennington
|
d240b5b1eb
|
Consolidate bourbon and link to it from both cms and lms
|
2012-10-01 15:17:40 -04:00 |
|