[Commits] [SCM] claws branch, oauth2, updated. 3.17.8-48-gc79a52334

[miras at claws-mail.org]

The branch, oauth2 has been updated
       via  c79a52334e9cb36273182aea79db6d99a2f09e8a (commit)
       via  8033e76e6a6ac3d193a8ed90982ecdcbaaeff282 (commit)
       via  8c1a4c98087d84292d4b617af3a9306f6bb2a4b7 (commit)
      from  1135efc54dcf4a6ec5b39be7cb6d5b0255f30dab (commit)

Summary of changes:
 AUTHORS                                        | 6 +++++-
 src/gtk/authors.h                              | 1 +
 src/plugins/litehtml_viewer/lh_widget_text.cpp | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit c79a52334e9cb36273182aea79db6d99a2f09e8a
Merge: 1135efc54 8033e76e6
Author: Michael Rasmussen <mir at datanom.net>
Date:   Wed Mar 17 16:36:53 2021 +0100

    Fix merge conflict
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --cc AUTHORS
index 5b5bae99b,3c59565e2..3b551265c
--- a/AUTHORS
+++ b/AUTHORS
@@@ -332,4 -332,6 +332,8 @@@ contributors (in addition to the above
  	Jean Delvare
  	Damian Poddebniak
  	Alvar Penning
-     David Fletcher
++        David Fletcher
+ 	Orivej Desh
+ 	Steve Randall
+ 	Ramin Yaghoubzadeh Torky
++

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail