Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle

Browse source

Conflicts:
	theme/bootstrapbase/style/moodle.css

...

This commit is contained in:

Dan Poltawski 2014-04-07 16:01:56 +08:00

parent 2aa476bbc8 51e73837b6

commit 5e8be14cb9

3 changed files with 1 additions and 5 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