diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /Makefile | |
parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'Makefile')
-rwxr-xr-x | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -41,6 +41,6 @@ travis: ## Make some stuff for Travis-CI | |||
41 | deploy: ## Deploy wallabag | 41 | deploy: ## Deploy wallabag |
42 | @bundle exec cap staging deploy | 42 | @bundle exec cap staging deploy |
43 | 43 | ||
44 | .PHONY: help clean install update build test release travis deploy | 44 | .PHONY: help clean install update build test release travis deploy run dev |
45 | 45 | ||
46 | .DEFAULT_GOAL := install | 46 | .DEFAULT_GOAL := install |