MDL-28126 webservice : resolved integration conflicts
authorAparup Banerjee <aparup@moodle.com>
Wed, 21 Dec 2011 03:20:50 +0000 (11:20 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 21 Dec 2011 03:20:50 +0000 (11:20 +0800)
commit3f14cf7f4e9c51b6c791de6bb9d740b0bd43aacb
tree5199c21a047d7ba0f38cdfbfcb569bf33e8071db
parente59a1dd67005eda30fa8008e29e931ca02c97ca0
parent47c3dfd5a4e5c5f1a632e8bd228a4140e299c432
MDL-28126 webservice : resolved integration conflicts
admin/webservice/forms.php
lang/en/webservice.php