Merge branch 'stable'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-11-16 21:35:08 +00:00
4 changed files with 18 additions and 7 deletions

View File

@ -74,5 +74,12 @@
"platform": {
"php": "7.3.0"
}
},
"scripts": {
"make-devtools": "@php -dphar.readonly=0 tests/plugins/DevTools/src/DevTools/ConsoleScript.php --make tests/plugins/DevTools --out plugins/DevTools.phar",
"make-server": [
"@composer install --no-dev --classmap-authoritative",
"@php -dphar.readonly=0 build/server-phar.php"
]
}
}