Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:00:33 +0000 (12:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:00:33 +0000 (12:00 +0200)
Conflicts:
composer.json

composer.json

index 54a6d00..469225d 100644 (file)
@@ -8,6 +8,6 @@
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpunit/dbUnit": "1.2.*",
-        "moodlehq/behat-extension": "1.27.8"
+        "moodlehq/behat-extension": "1.27.9"
     }
 }