Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle

Browse source

Conflicts:
	theme/bootstrapbase/style/moodle.css

...

This commit is contained in:

Sam Hemelryk 2013-10-08 08:48:43 +13:00

parent 81a939be02 09bfdcb091

commit 6455dec02d

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