From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Nov 2019 15:09:49 +0000 (+0000)
Subject: Merge branch 'community'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae253baa486350f1924329e58cb68570dce65c1a;p=ipfire.org.git

Merge branch 'community'
---

ae253baa486350f1924329e58cb68570dce65c1a
diff --cc Makefile.am
index 2fdbd9ab,be16ecf8..fcbfd0d7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -264,9 -257,17 +264,8 @@@ templates_people_modules_DATA = 
  
  templates_people_modulesdir = $(templates_peopledir)/modules
  
 -templates_people_ssh_keys_DATA = \
 -	src/templates/people/ssh-keys/delete.html \
 -	src/templates/people/ssh-keys/error.html \
 -	src/templates/people/ssh-keys/error-invalid-key.html \
 -	src/templates/people/ssh-keys/index.html \
 -	src/templates/people/ssh-keys/upload.html
 -
 -templates_people_ssh_keysdir = $(templates_peopledir)/ssh-keys
 -
  templates_static_DATA = \
  	src/templates/static/blocked.html \
- 	src/templates/static/chat.html \
  	src/templates/static/features.html \
  	src/templates/static/legal.html \
  	src/templates/static/support.html