Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Wed, 25 Sep 2013 04:27:09 +0000 (16:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 25 Sep 2013 04:27:09 +0000 (16:27 +1200)
commite50df55c919aac76b503704687ac50bc79eeed7c
tree8c86cf792b49dd5bc69768be2dcfb1307a0ea3f9
parent093a6fe77fc39b06c804fbe4bfcac9834a52c966
parentf6ebcd34f275d8bcc1094cbb98df2ff2b8fef1b5
Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges

Conflicts:
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css
lang/en/badges.php
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css