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

Browse source

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css

...

This commit is contained in:

Damyon Wiese 2014-06-24 14:10:51 +08:00

parent e9018b50a2 328ef3df0e

commit d9640a99ba

6 changed files with 80 additions and 13 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