Merge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 08:30:31 +0000 (10:30 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 08:30:31 +0000 (10:30 +0200)
commit4fcca5378b8703babbab81662aaeb721c87bcf54
tree8eaedd5ee1528456853364e12c102e319c76d203
parentacb75afe395a41b93cf5a8313026eb8851dc14d8
parent3bce7d08801e8fc1fdb51bbb3ffd8339a318906a
Merge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle

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