Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle

Browse source

Conflicts:
	theme/bootstrapbase/style/moodle.css

...

This commit is contained in:

Sam Hemelryk 2014-05-20 08:52:54 +12:00

parent adb5d8a5d6 2c47e5005b

commit d57e3f8201

2 changed files with 6 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