Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Apr 2014 05:30:41 +0000 (13:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Apr 2014 05:30:41 +0000 (13:30 +0800)
commit515fe565f6723f8e3808b1d5fdb0308f9dd23ca1
tree007a6258e3064b7f5fe20110ae0e65c4c71fce54
parent594a5c8c02b602b2acfb73cd3a0246f87632bc19
parent46d70f05353a0998fe5a38c6c3fa701f69e26581
Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

Conflicts:
theme/bootstrapbase/less/moodle/forms.less
theme/bootstrapbase/style/moodle.css
version.php
15 files changed:
availability/condition/completion/version.php
availability/condition/date/version.php
availability/condition/grade/version.php
availability/condition/group/version.php
availability/condition/grouping/version.php
availability/condition/profile/version.php
course/lib.php
course/moodleform_mod.php
lib/classes/plugin_manager.php
lib/db/upgrade.php
lib/setuplib.php
theme/base/style/core.css
theme/bootstrapbase/less/moodle/forms.less
theme/bootstrapbase/style/moodle.css
version.php