Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 07:47:52 +0000 (15:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 07:47:52 +0000 (15:47 +0800)
commitd76cb8ee26a5425aa91b89cac7bf8e923dc82140
tree91471eccf901d97c44ffd637b2d5d9da6b4e82a8
parentcbd91e23e9917b9f8ee92e9dc4c81dbf03d49e55
parent772b01f4a72ac6996f5d2332a5429889e3c71066
Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle

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