Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle

Browse source

Conflicts:
	theme/bootstrapbase/style/moodle.css

...

This commit is contained in:

Sam Hemelryk 2014-09-23 12:23:08 +12:00

parent db6c48bfc1 cb9c6a7dc6

commit be91dff8bb

2 changed files with 64 additions and 1 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

2

theme/bootstrapbase/style/moodle.css

View file

File diff suppressed because one or more lines are too long