| commit | d4308dff593885c009a577c7671bc15defe2581f | |
| author | Dan Poltawski <dan@moodle.com> | |
| Thu, 7 Nov 2013 03:58:46 +0000 (7 11:58 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Thu, 7 Nov 2013 03:58:46 +0000 (7 11:58 +0800) | ||
| tree | 6be62f50dae51363110fe23275b5e99edd94e908 | treesnapshot (tar.gz zip) |
| parent | f6a2a36bcd97d2750f8b6aba65e9be70b04c3c84 | commitdiff |
| parent | 9cb48f50c481c616ca167330529c7a1bffb904f5 | commitdiff |
Merge branch 'MDL-42628_b' of https://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/base/style/course.css | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/less/moodle/course.less | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |