From 63dc51c35d26c837295ac0ef33c1b8e41353ea35 Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Wed, 27 Jun 2018 17:30:37 +0200
Subject: Merge 'eel' into 'master'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace content from 'master' by content from 'eel' as it's the new
version based on 4a on which new development will be done.

Change-Id: I2966af7dcee59701ff3a344487c008d7e65e68ed
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 conf.d/app-templates | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 conf.d/app-templates

(limited to 'conf.d/app-templates')

diff --git a/conf.d/app-templates b/conf.d/app-templates
new file mode 160000
index 0000000..1f2944e
--- /dev/null
+++ b/conf.d/app-templates
@@ -0,0 +1 @@
+Subproject commit 1f2944eea3a418ec02920673a390ed4b5d417a2b
-- 
cgit 1.2.3-korg