Skip to content

E
edx-platform
Commit 0ebdbb92 by Don Mitchell
Options

Merge branch 'feature/btalbot/cms-settings' of 

git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	lms/static/sass/bourbon
parents f0c94a2c baf8b481
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment