From 58bf36f15fa16369edd91b50641a2ec348ed3df7 Mon Sep 17 00:00:00 2001
From: L-MzK <73669620+L-MzK@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:39:26 +0200
Subject: [PATCH] =?UTF-8?q?Greeting=20channel=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sonst Konflikt mit Master und das wollen wir nicht.
---
 .env.template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env.template b/.env.template
index 5b012a9..20559ac 100644
--- a/.env.template
+++ b/.env.template
@@ -6,9 +6,10 @@ DISCORD_ACTIVITY=<What should be shown, Bot is playing right now>
 # IDs
 DISCORD_ADMIN_ROLE=<ID of Admin Role>
 DISCORD_CALMDOWN_ROLE=<ID of calmdown role>
-DISCORD_MOD_ROLE=<ID of Mod Role>
 DISCORD_FEUNEWS_ROLE=<ID of FEU news role>
+DISCORD_MOD_ROLE=<ID of Mod Role>
 DISCORD_BOTUEBUNGSPLATZ_CHANNEL=<ID of channel for bot experiments>
+DISCORD_GREETING_CHANNEL=<ID of channel where users will be greeted when they join>
 DISCORD_NEWS_CHANNEL=<ID of news channel>
 DISCORD_OFFTOPIC_CHANNEL=<ID of channel for greeting & everydays subjects and questions>
 DISCORD_POLL_SUGG_CHANNEL=<ID of Channel, where poll suggestions are posted>
@@ -27,4 +28,4 @@ DISCORD_TIMER_FILE=<File name for running timers JSON file>
 DISCORD_APPOINTMENTS_FILE=<File name for running appointments JSON file>
 
 # Misc
-DISCORD_DATE_TIME_FORMAT=<Date and time format used for commands like %d.%m.%Y %H:%M>
\ No newline at end of file
+DISCORD_DATE_TIME_FORMAT=<Date and time format used for commands like %d.%m.%Y %H:%M>
-- 
GitLab