Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 04:47:38 +0000 (16:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 04:47:38 +0000 (16:47 +1200)
commit19dfbe3001b3ccfcfd0028e952be52a0d6139446
tree06048e24c71680a6bb4189548857514608078ebd
parent00719eefd7191e4afa185c6f82cc7e1ae8496dd0
parent5d752f4bbc9cac056a2263121e825e062867565f
Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle

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