Merge branch 'MDL-53805-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 04:24:45 +0000 (12:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 04:24:45 +0000 (12:24 +0800)
commitf3ba5f4249048ef3eb02a41da0c798278e72fb75
treede174635692231c6b934836a892eed1638e24079
parent03b5351f88c2e59209008dc7d177ec9de50dd5e1
parent5d4dafcfa078586e58b7a04192b126bc69ea79f6
Merge branch 'MDL-53805-master' of git://github.com/cameron1729/moodle

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