| commit | 12539749f478643be9dfeee987e52f71aa298eea | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Mon, 2 Dec 2013 00:44:05 +0000 (2 13:44 +1300) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Mon, 2 Dec 2013 00:44:05 +0000 (2 13:44 +1300) | ||
| tree | 81f638d931c9261ee605a9a8b800ab1e87c91362 | treesnapshot (tar.gz zip) |
| parent | f2d7e2dca9b95c50acea30ba26ba84cc1cdd3ac5 | commitdiff |
| parent | e94d0232255d066c923ee55bcbbf5116c5b9b432 | commitdiff |
Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |