| commit | c556c5fca59e24f8a0dd67a8e4dcb0cbffa6485a | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 1 Jul 2015 00:57:15 +0000 (1 08:57 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 1 Jul 2015 00:57:15 +0000 (1 08:57 +0800) | ||
| tree | 8b0a429293fa9cee875771f3c1e3fae45a9978fa | treesnapshot (tar.gz zip) |
| parent | 7b15a363201109354bbd6d51a7c70f50dac7b9d8 | commitdiff |
| parent | 5856c7691750dc890233077aa2ca16f00e15a6c1 | commitdiff |
Merge branch 'MDL-50497-M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |