Merge remote-tracking branch 'origin/master' into 2.4

# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js

1 files changed, 2 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index 0f4cbbe8..fefdd017 100755..100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,2 @@
-TMP_FOLDER=/tmp
-RELEASE_FOLDER=wllbg-release
-
-ENV ?= prod
-
-help: ## Display this help menu
-        @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-clean: ## Clear the application cache
-        rm -rf var/cache/*
-
-install: ## Install wallabag with the latest version
-        @sh scripts/install.sh $(ENV)
-
-update: ## Update the wallabag installation to the latest version
-        @sh scripts/update.sh $(ENV)
-
-dev: ## Install the latest dev version
-        @sh scripts/dev.sh
-
-run: ## Run the wallabag built-in server
-        @php bin/console server:run --env=dev
-
-build: ## Run webpack
-        @npm run build:$(ENV)
-
-prepare: clean ## Prepare database for testsuite
-ifdef DB
-        cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-        -php bin/console doctrine:database:drop --force --env=test
-        php bin/console doctrine:database:create --env=test
-        php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
-fixtures: ## Load fixtures into database
-        php bin/console doctrine:fixtures:load --no-interaction --env=test
-
-test: prepare fixtures ## Launch wallabag testsuite
-        bin/simple-phpunit -v
-
-release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
-ifndef VERSION
-        $(error VERSION is not set)
-endif
-        @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
-
-deploy: ## Deploy wallabag
-        @bundle exec cap staging deploy
-
-.PHONY: help clean prepare install fixtures update build test release deploy run dev
-
-.DEFAULT_GOAL := install
+.DEFAULT:
+        gmake $@