]> git.mjollnir.org Git - moodle.git/commit
merging collisions cleanup
authorskodak <skodak>
Mon, 4 Sep 2006 20:32:59 +0000 (20:32 +0000)
committerskodak <skodak>
Mon, 4 Sep 2006 20:32:59 +0000 (20:32 +0000)
commit4b83ec33fee7b28ddc163576a4ef57c63e78de45
tree7349c2b701cfe9bfea4562653eb2f3a13ccc2cee
parentd0d5525d93895ecafbe3253b7acf84b4f56f28db
merging collisions cleanup
admin/settings/maintenance.php [deleted file]