| commit | e3dfd1a1d96c5f60822d6a13a23e8ffa430f4b1d | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Wed, 9 Nov 2011 21:15:50 +0000 (10 10:15 +1300) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Wed, 9 Nov 2011 21:15:50 +0000 (10 10:15 +1300) | ||
| tree | 3a2b4862b20fd83e7de9f190f87abafab7a43930 | treesnapshot (tar.gz zip) |
| parent | 7d99144e83125433bea233c475473d9fe9529fb8 | commitdiff |
| parent | 274a7d370183a92636cfcdd90883e4795f466195 | commitdiff |
Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution
| course/lib.php | diff1 | diff2 | blobhistory |
| report/log/locallib.php | diff1 | diff2 | blobhistory |
| report/participation/index.php | diff2 | blobhistory | |
| theme/upgrade.txt | diff1 | diff2 | blobhistory |