Merge remote-tracking branch 'upstream/master'

Browse Source

Conflicts:
	AUTHORS

...

This commit is contained in:

Jillian Vogel

2015-12-04 09:31:32 +10:30

parent 6fd5ba5a69 068b439ada

commit b7f0836be8

53 changed files with 786 additions and 162 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

cms/static/images/edx-theme/edx-studio-logo.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.7 KiB

0

cms/static/images/default-theme/logo.png → cms/static/images/studio-logo.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 4.1 KiB