| commit | 8053854592571abace08ce7b493ca264a61e0e1e | |
| author | Damyon Wiese <damyon@moodle.com> | |
| Mon, 17 Feb 2014 06:12:16 +0000 (17 14:12 +0800) | ||
| committer | Damyon Wiese <damyon@moodle.com> | |
| Mon, 17 Feb 2014 06:12:16 +0000 (17 14:12 +0800) | ||
| tree | fae0a10a8119ec25310b4dae7ebedbd7d59e5b1d | treesnapshot (tar.gz zip) |
| parent | 09c7f57fd2e57eb7b99388d71360257860f90adf | commitdiff |
| parent | 9452cae8ddcfca63c2f09d5098370c22c1920768 | commitdiff |
Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
Conflicts:
lang/en/admin.php
Conflicts:
lang/en/admin.php
| admin/settings/appearance.php | diff1 | diff2 | blobhistory |
| lang/en/admin.php | diff1 | diff2 | blobhistory |
| lib/setuplib.php | diff1 | diff2 | blobhistory |