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

2018-02-05 17:53:30 +08:00
parent b3c71b12c7 5ac4c7f2ba
commit 38055cdb22
2 changed files with 387 additions and 284 deletions
@@ -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"
    }
 }