]> git.mjollnir.org Git - moodle.git/commit
fixed conflict
authorkoenr <koenr>
Thu, 1 Mar 2007 20:27:00 +0000 (20:27 +0000)
committerkoenr <koenr>
Thu, 1 Mar 2007 20:27:00 +0000 (20:27 +0000)
commit635bb616fa6307b7cd869fd1b1c12b92736e4b85
tree448a67b462a2a0f9c0534424040fd83e4344d68b
parent31f6834e366ef1497bcc65d5bb0c10a41d152905
fixed conflict
lang/en_utf8/currencies.php