Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Oct 2013 02:31:44 +0000 (10:31 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Oct 2013 02:31:44 +0000 (10:31 +0800)
commit00ae230f526ee65218f373c27669d32b3adeeaa6
treef2e7320eafa9739f910815e4f6598e1df7e5d4d3
parent0965a9be10356a29c296ab79c90c244161fa1851
parentaccdf036fab031e0ed6564c841a237bae964ab93
Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle

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