Merge branch '44944-27' of git://github.com/samhemelryk/moodle

Browse source

Conflicts:
	theme/bootstrapbase/style/moodle.css

...

This commit is contained in:

Marina Glancy 2014-04-09 09:48:41 +08:00

parent e97b942223 af23b60598

commit 47a1315f02

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