Skip to content

Commit

Permalink
Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle
Browse files Browse the repository at this point in the history
Conflicts:
	composer.json
  • Loading branch information
stronk7 committed May 8, 2014
2 parents ab870c7 + 50a01e0 commit a23a2ed
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit a23a2ed

Please sign in to comment.