From 82851d2039f619f1b2558e06b04a9e47fceeea54 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 15 Dec 2019 14:08:49 +0100
Subject: Make master the rolling release branch (#2705)

* Change default TAG in Makefile

We are going to drop the `dev` branch. The Docker tag `dev-*` are based
on this branch and so there will be no longer be generated. We must use
images based on the `master` branch (i.e. `latest`, `alpine` and `arm`).

* Remove references to dev branch in documentation

* Synchronize French documentation
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 642f2e5a3..dcb547c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 
 ifndef TAG
-	TAG=dev-alpine
+	TAG=alpine
 endif
 
 PORT ?= 8080
-- 
cgit v1.2.3