| commit | 0d38abcf38a09e8bc28ac0b7cac700589e75aad4 | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Mon, 8 Aug 2011 05:58:10 +0000 (8 13:58 +0800) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Mon, 8 Aug 2011 05:58:10 +0000 (8 13:58 +0800) | ||
| tree | 2d8708c33765fef5bd725eb343c49d1d463ffa69 | treesnapshot (tar.gz zip) |
| parent | 9e4b5b45a497cc251a27febda31599d640eb35ef | commitdiff |
| parent | 34497bd33e2df62a96f5a1174e6118f4dc6f0490 | commitdiff |
Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution
| theme/formal_white/style/formal_white.css | diff1 | diff2 | blobhistory |