| commit | 3a047312b612dfd6fef2cccba85c13094d5bb9df | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 8 Apr 2014 01:22:38 +0000 (8 09:22 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 8 Apr 2014 01:22:38 +0000 (8 09:22 +0800) | ||
| tree | bc2ccce0bfddacf945b48ab235474354c1769666 | treesnapshot (tar.gz zip) |
| parent | 72c0f16889f5bb7d395ce0fd19b5e03af99ec800 | commitdiff |
| parent | 566889aaa8913d5e678e1f13862dc8018889ca29 | commitdiff |
Merge branch '42317-27' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |