| commit | 5218a6e8fb169878f3237e92a0deeb71d2427cfd | |
| author | Dan Poltawski <dan@moodle.com> | |
| Mon, 2 Sep 2013 03:52:21 +0000 (2 11:52 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Mon, 2 Sep 2013 03:52:21 +0000 (2 11:52 +0800) | ||
| tree | b974e5bf99ac8c6a892753223071ec1f3be7cb1e | treesnapshot (tar.gz zip) |
| parent | 581a1695acd6ef39bf3100df253a4d387be943d6 | commitdiff |
| parent | 1148cdfd6ce934d91402025a27e44e20525b803e | commitdiff |
Merge branch 'MDL-41175_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/base/style/core.css | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/less/moodle/core.less | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |