Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 29 deletions

diff --git a/server/vendor/guzzlehttp/psr7/Makefile b/server/vendor/guzzlehttp/psr7/Makefile
deleted file mode 100755
index 8b00b43..0000000
--- a/server/vendor/guzzlehttp/psr7/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit $(TEST)
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage $(TEST)
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-check-tag:
-	$(if $(TAG),,$(error TAG is not defined. Pass via "make tag TAG=4.2.1"))
-
-tag: check-tag
-	@echo Tagging $(TAG)
-	chag update $(TAG)
-	git commit -a -m '$(TAG) release'
-	chag tag
-	@echo "Release has been created. Push using 'make release'"
-	@echo "Changes made in the release commit"
-	git diff HEAD~1 HEAD
-
-release: check-tag
-	git push origin master
-	git push origin $(TAG)
-
-clean:
-	rm -rf artifacts/*