diff options
| author | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
| commit | 901acc9703ae58b625b44e7abfd02333b9bab951 (patch) | |
| tree | 1a8fc17a85544bc7b8064874923e2fe6e3f44354 /Makefile | |
| parent | 21afaf4bedcad578d4f876bb315d1072ccd296e6 (diff) | |
| parent | 2b3b6051d265edf131d006b2eb14f55284faf1e5 (diff) | |
| download | chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.gz chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.bz2 chat-901acc9703ae58b625b44e7abfd02333b9bab951.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ -.PHONY: build package run stop run-client run-server stop-client stop-server restart restart-server restart-client start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist setup-mac prepare-enteprise run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows internal-test-web-client vet run-server-for-web-client-tests +.PHONY: build package run stop run-client run-server stop-client stop-server restart restart-server restart-client start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist setup-mac prepare-enteprise run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows package-common package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests ROOT := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) |