| commit | ed24890b68e4ec0ea76b8e64e712e7447c8dd0d7 | |
| author | Damyon Wiese <damyon@moodle.com> | |
| Tue, 25 Feb 2014 01:21:30 +0000 (25 09:21 +0800) | ||
| committer | Damyon Wiese <damyon@moodle.com> | |
| Tue, 25 Feb 2014 01:21:30 +0000 (25 09:21 +0800) | ||
| tree | c7428570b774a9bdcf04d5ad08c19a6921236264 | treesnapshot (tar.gz zip) |
| parent | 237243db0242aa5ad2913521c6dba65bcb55ddaf | commitdiff |
| parent | 88d366e5952a6ea7b53ef9722b5db95aef875410 | commitdiff |
Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |