| commit | 2b7e18fdedae14a01ef6ba89af40af4a6d3558c7 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 4 Jun 2013 06:38:36 +0000 (4 14:38 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 4 Jun 2013 06:38:36 +0000 (4 14:38 +0800) | ||
| tree | 8e2fe8d2b0926fcf909e48788b53f347b62afd68 | treesnapshot (tar.gz zip) |
| parent | f85cb076aaf165d25f6133638b83d01b0b6849ad | commitdiff |
| parent | dfb83eb132205d336d53ea0d7cb49953dfe160f1 | commitdiff |
Merge branch 'wip-MDL-39819_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |