| commit | 67a75acaffc80e767d3fd9ef1a479cda0e055891 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Mon, 13 Jan 2014 02:03:47 +0000 (13 10:03 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Mon, 13 Jan 2014 02:03:47 +0000 (13 10:03 +0800) | ||
| tree | 3615fe2ac776a57882a389764bd8f1424c075f6a | treesnapshot (tar.gz zip) |
| parent | 6060234de5f182afa462f836b1eb54dc74ab52d9 | commitdiff |
| parent | 9a093f57a100fb33d171cf2b4357fdd701eea006 | commitdiff |
Merge branch 'MDL-41152-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |