Conflicts: theme/bootstrap/style/generated.css theme/bootstrap/style/moodle.css theme/bootstrapbase/less/moodle/recess.txt theme/bootstrapbase/style/generated.css