Skip to content
Permalink
Browse files

Merge branch 'MDL-61269_33' of git://github.com/stronk7/moodle into M…

…OODLE_33_STABLE
  • Loading branch information...
andrewnicols committed Feb 5, 2018
2 parents b3c71b1 + 5ac4c7f commit 38055cdb22cb3f52d6fdc0919816c31358f468ea
Showing with 387 additions and 284 deletions.
  1. +2 −2 composer.json
  2. +385 −282 composer.lock
@@ -1,13 +1,13 @@
{
"name": "moodle/moodle",
"license": "GPL-3.0",
"license": "GPL-3.0-or-later",
"description": "Moodle - the world's open source learning platform",
"type": "project",
"homepage": "https://moodle.org",
"require-dev": {
"phpunit/phpunit": "5.5.*",
"phpunit/dbUnit": "1.4.*",
"moodlehq/behat-extension": "3.33.1",
"moodlehq/behat-extension": "3.33.2",
"mikey179/vfsStream": "^1.6"
}
}

0 comments on commit 38055cd

Please sign in to comment.
You can’t perform that action at this time.