From ca55b048acc86073e07effab9f0a1b791e2eb5e1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 25 Sep 2016 17:17:08 +0200
Subject: [PATCH] updateing chredits and CHANGELOG

---
 CHANGELOG            | 10 ++++++++++
 util/credits.txt     |  2 ++
 util/make_credits.py |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1e6b0129de..c9fbfc673e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+Version 3.5.1
+  Friendica Core:
+    Small changes to the admin panel overview and logging settings [tobiasd]
+    Updates to the translations (DE, FR, PT-BR) [translation teams]
+    Fix for a potential XSS vector [heluecht, thanks to Vít Šesták 'v6ak' for reporting the problem]
+
+  Friendica Addons:
+    Updates to the translations (FR, PT-BR) [translation teams]
+
+
 Version 3.5
   Friendica Core:
     NEW Optional local directory with possible federated contacts [heluecht]
diff --git a/util/credits.txt b/util/credits.txt
index d3c7c14f16..ddbc36ab6e 100644
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -72,6 +72,7 @@ hauke
 Hauke Altmann
 Hauke Zühl
 Hubert Kościański
+Hypolite Petovan
 Jak
 Jakob
 jensp
@@ -173,6 +174,7 @@ ufic
 Vasudev Kamath
 Vasya Novikov
 vislav
+Vít Šesták 'v6ak'
 Yasen Pramatarov
 ylms
 Zach Prezkuta
diff --git a/util/make_credits.py b/util/make_credits.py
index 9575f10ffb..e5ea52448e 100755
--- a/util/make_credits.py
+++ b/util/make_credits.py
@@ -32,7 +32,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
 path = os.path.abspath(argv[0].split('util/make_credits.py')[0])
 print('> base directory is assumed to be: '+path)
 #  a place to store contributors
-contributors = ['Andi Stadler']
+contributors = ["Andi Stadler", "Vít Šesták 'v6ak'"]
 #  get the contributors
 print('> getting contributors to the friendica core repository')
 p = subprocess.Popen(['git', 'shortlog', '--no-merges', '-s'],
-- 
2.39.5