]> git.mjollnir.org Git - moodle.git/commit
fixed collisions in merges, sorry
authorskodak <skodak>
Sun, 3 Sep 2006 15:21:46 +0000 (15:21 +0000)
committerskodak <skodak>
Sun, 3 Sep 2006 15:21:46 +0000 (15:21 +0000)
commitf21def1f11c01df1c141699f498e75ceb0a08c0c
tree9870ef175dae66fc870b10db6bfce9edd76f0599
parent11737b8bfa73af934557c33f5e1098d1a2c0e0ee
fixed collisions in merges, sorry
admin/auth.php
admin/enrol.php
admin/maintenance.php
admin/roles/manage.php