talons

commit 78126ed2ffa2831881926b10a3f51283028cdd07
parent c314564b6fd538653b6def72df7c35ea59174209
Author: Michael Rasmussen <mir@datanom.net>
Date:   Sun,  7 Mar 2021 21:14:30 +0100

Merge branch 'master' into oauth2

Diffstat:
M
AUTHORS
 | 
11
+++++------
M
src/gtk/authors.h
 | 
1
+

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -2,14 +2,10 @@ Claws Mail
 
 	Holger Berndt		<berndth@users.sf.net>
 	Tristan Chabredier	<wwp@claws-mail.org>
-	Andrej Kacian		<ticho@claws-mail.org> 
 	Darko Koruga		<darko@users.sourceforge.net>
-	Charles Lehner		<charles@claws-mail.org>
-	Colin Leroy-Mira	<colin@colino.net>
 	Paul Mangan		<paul@claws-mail.org>
 	Ricardo Mones Lastra 	<ricardo@mones.org>
 	Salvatore De Paolis	<iwkse@claws-mail.org>
-	Pawel Pekala		<cOrn@o2.pl>
 	Michael Rasmussen	<mir@datanom.net>
  
 	Ex Team Members
@@ -20,8 +16,12 @@ Claws Mail
 	Oliver Haertel 		<o.h.a@gmx.net>
 	Christoph Hohmann	<reboot@gmx.ch>
 	Alfons Hoogervorst	<alfons@proteus.demon.nl>
+	Andrej Kacian		
 	Werner Koch		<wk@gnupg.org>
+	Charles Lehner		
+	Colin Leroy-Mira	<colin@colino.net>
 	Thorsten Maerz		<torte@netztorte.de>
+	Pawel Pekala		<cOrn@o2.pl>
 	Leandro A. F. Pereira 	<leandro@linuxmag.com.br>
 	Luke Plant 		<L.Plant.98@cantab.net>
 	Martin Schaaf		<mascha@ma-scha.de>
@@ -32,8 +32,7 @@ Claws Mail
 
 Claws Mail for Windows
 
-	Andrej Kacian		<ticho@claws-mail.org> 
-	Colin Leroy		<colin@colino.net>
+	Jonathan Boeing		<jonathan@claws-mail.org> 
 	
 	Ex Team Members
 	Werner Koch		<wk@gnupg.org>
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -1,5 +1,6 @@
 static char *TEAM_LIST[] = {
 "Holger Berndt <berndth@users.sf.net>",
+"Jonathan Boeing <jonathan@claws-mail.org>",
 "Tristan Chabredier <wwp@claws-mail.org>",
 "Darko Koruga <darko@users.sf.net>",
 "Paul Mangan <paul@claws-mail.org>",