| commit | 00ae230f526ee65218f373c27669d32b3adeeaa6 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Thu, 10 Oct 2013 02:31:44 +0000 (10 10:31 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Thu, 10 Oct 2013 02:31:44 +0000 (10 10:31 +0800) | ||
| tree | f2e7320eafa9739f910815e4f6598e1df7e5d4d3 | treesnapshot (tar.gz zip) |
| parent | 0965a9be10356a29c296ab79c90c244161fa1851 | commitdiff |
| parent | accdf036fab031e0ed6564c841a237bae964ab93 | commitdiff |
Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |