| commit | e0fc61f993f1a7926d25ed0ed1ffe2df78ae62c3 | |
| author | Damyon Wiese <damyon@moodle.com> | |
| Tue, 7 May 2013 02:41:44 +0000 (7 10:41 +0800) | ||
| committer | Damyon Wiese <damyon@moodle.com> | |
| Tue, 7 May 2013 02:41:44 +0000 (7 10:41 +0800) | ||
| tree | 1a858071d0b5a5a51aea6cf0f948209ea5f81e28 | treesnapshot (tar.gz zip) |
| parent | 4d71661e2bb7adbfcfea621980271ef66a408a17 | commitdiff |
| parent | f8ba185ac5156e2beb949d05cd578a0c42ec0665 | commitdiff |
Merge branch 'MDL-39162' of git://github.com/totara/openbadges
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| badges/renderer.php | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/less/moodle/core.less | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |