From 3a33d0dd0c3c7736ec3aeb0fc10535d633b01e14 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sat, 15 Feb 2020 21:49:24 +0700
Subject: [PATCH 1/6] Add SimpleLogin to email solutions section

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8e748c0..75dbdf62 100644
--- a/README.md
+++ b/README.md
@@ -325,7 +325,7 @@ _Simple deployment of a mail server, e.g. for inexperienced or impatient admins.
 - [Qmailtoaster](http://www.qmailtoaster.com/) - Stable, full-featured, easy-to-install mail server based on qmail. ([Source Code](https://github.com/QMailToaster/)) `Multiple` `Linux`
 - [Simple NixOS Mailserver](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver) - Complete mailserver solution leveraging the Nix Ecosystem. `GPL-3.0` `Nix`
 - [wildduck](https://wildduck.email/) - Scalable no-SPOF IMAP/POP3 mail server. ([Source Code](https://github.com/nodemailer/wildduck)) `EUPL-1.2` `Node.js`
-
+- [SimpleLogin](https://simplelogin.io) - Open source email alias solution to protect your email address. Comes with browser extensions and mobile apps. ([Source Code](https://github.com/simple-login/app)) `MIT` `Python`
 #### Mail Transfer Agents
 
 _MTAs / SMTP servers_

From 6c652a6287f9fdb54ec86b4f77ee7800c8a4d6fb Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sat, 15 Feb 2020 21:50:40 +0700
Subject: [PATCH 2/6] Add SimpleLogin to Federated Identity/Authentication
 section

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 75dbdf62..1de04c00 100644
--- a/README.md
+++ b/README.md
@@ -646,6 +646,8 @@ _Institutional repository and digital library software._
 
 ## Federated Identity/Authentication
 
+- [SimpleLogin](https://simplelogin.io) - Open source OAuth2/OpenID Connect Identity Provider that provides a privacy-first alternative to the "Sign in with Facebook|Google|Apple" button. ([Source Code](https://github.com/simple-login/app)) `MIT` `Python`
+
 **[`^        back to top        ^`](#)**
 
 See https://github.com/n1trux/awesome-sysadmin#identity-management

From 573deae5424c499da675978e650660e7a1e05512 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sat, 15 Feb 2020 21:52:53 +0700
Subject: [PATCH 3/6] Order alphabetically

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1de04c00..734702a4 100644
--- a/README.md
+++ b/README.md
@@ -323,10 +323,10 @@ _Simple deployment of a mail server, e.g. for inexperienced or impatient admins.
 - [Mail-in-a-Box](https://mailinabox.email/) - Turns any Ubuntu server into a fully functional mail server with one command. ([Source Code](https://github.com/mail-in-a-box/mailinabox)) `CC0-1.0` `Shell`
 - [Modoboa](http://modoboa.org/en/) - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface. ([Source Code](https://github.com/tonioo/modoboa)) `MIT` `Python`
 - [Qmailtoaster](http://www.qmailtoaster.com/) - Stable, full-featured, easy-to-install mail server based on qmail. ([Source Code](https://github.com/QMailToaster/)) `Multiple` `Linux`
-- [Simple NixOS Mailserver](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver) - Complete mailserver solution leveraging the Nix Ecosystem. `GPL-3.0` `Nix`
-- [wildduck](https://wildduck.email/) - Scalable no-SPOF IMAP/POP3 mail server. ([Source Code](https://github.com/nodemailer/wildduck)) `EUPL-1.2` `Node.js`
 - [SimpleLogin](https://simplelogin.io) - Open source email alias solution to protect your email address. Comes with browser extensions and mobile apps. ([Source Code](https://github.com/simple-login/app)) `MIT` `Python`
 #### Mail Transfer Agents
+- [Simple NixOS Mailserver](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver) - Complete mailserver solution leveraging the Nix Ecosystem. `GPL-3.0` `Nix`
+- [wildduck](https://wildduck.email/) - Scalable no-SPOF IMAP/POP3 mail server. ([Source Code](https://github.com/nodemailer/wildduck)) `EUPL-1.2` `Node.js`
 
 _MTAs / SMTP servers_
 

From 9a7c0c95ff042abd96f8d651c5cb6175f11913c0 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sun, 16 Feb 2020 22:10:22 +0700
Subject: [PATCH 4/6] Fix mistake of moving "#### Mail Transfer Agents" to a
 wrong location

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 734702a4..a5411baf 100644
--- a/README.md
+++ b/README.md
@@ -324,10 +324,11 @@ _Simple deployment of a mail server, e.g. for inexperienced or impatient admins.
 - [Modoboa](http://modoboa.org/en/) - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface. ([Source Code](https://github.com/tonioo/modoboa)) `MIT` `Python`
 - [Qmailtoaster](http://www.qmailtoaster.com/) - Stable, full-featured, easy-to-install mail server based on qmail. ([Source Code](https://github.com/QMailToaster/)) `Multiple` `Linux`
 - [SimpleLogin](https://simplelogin.io) - Open source email alias solution to protect your email address. Comes with browser extensions and mobile apps. ([Source Code](https://github.com/simple-login/app)) `MIT` `Python`
-#### Mail Transfer Agents
 - [Simple NixOS Mailserver](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver) - Complete mailserver solution leveraging the Nix Ecosystem. `GPL-3.0` `Nix`
 - [wildduck](https://wildduck.email/) - Scalable no-SPOF IMAP/POP3 mail server. ([Source Code](https://github.com/nodemailer/wildduck)) `EUPL-1.2` `Node.js`
 
+#### Mail Transfer Agents
+
 _MTAs / SMTP servers_
 
 - [chasquid](https://blitiri.com.ar/p/chasquid/) - SMTP (email) server with a focus on simplicity, security, and ease of operation. ([Source Code](https://blitiri.com.ar/git/r/chasquid/)) `Apache-2.0` `Go`

From 5107f7718d97dfea6abac81ed3e0fac4cc982d26 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sun, 16 Feb 2020 22:28:56 +0700
Subject: [PATCH 5/6] Remove SimpleLogin from Federated Identity section

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index a5411baf..c948c5cc 100644
--- a/README.md
+++ b/README.md
@@ -647,8 +647,6 @@ _Institutional repository and digital library software._
 
 ## Federated Identity/Authentication
 
-- [SimpleLogin](https://simplelogin.io) - Open source OAuth2/OpenID Connect Identity Provider that provides a privacy-first alternative to the "Sign in with Facebook|Google|Apple" button. ([Source Code](https://github.com/simple-login/app)) `MIT` `Python`
-
 **[`^        back to top        ^`](#)**
 
 See https://github.com/n1trux/awesome-sysadmin#identity-management

From 3f6d282004078916c75a000434def6e22ca2d22c Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Fri, 1 May 2020 14:17:58 +0000
Subject: [PATCH 6/6] fix language tag for simplelogin

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c948c5cc..4c99a088 100644
--- a/README.md
+++ b/README.md
@@ -323,7 +323,7 @@ _Simple deployment of a mail server, e.g. for inexperienced or impatient admins.
 - [Mail-in-a-Box](https://mailinabox.email/) - Turns any Ubuntu server into a fully functional mail server with one command. ([Source Code](https://github.com/mail-in-a-box/mailinabox)) `CC0-1.0` `Shell`
 - [Modoboa](http://modoboa.org/en/) - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface. ([Source Code](https://github.com/tonioo/modoboa)) `MIT` `Python`
 - [Qmailtoaster](http://www.qmailtoaster.com/) - Stable, full-featured, easy-to-install mail server based on qmail. ([Source Code](https://github.com/QMailToaster/)) `Multiple` `Linux`
-- [SimpleLogin](https://simplelogin.io) - Open source email alias solution to protect your email address. Comes with browser extensions and mobile apps. ([Source Code](https://github.com/simple-login/app)) `MIT` `Python`
+- [SimpleLogin](https://simplelogin.io) - Open source email alias solution to protect your email address. Comes with browser extensions and mobile apps. ([Source Code](https://github.com/simple-login/app)) `MIT` `Docker/Python`
 - [Simple NixOS Mailserver](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver) - Complete mailserver solution leveraging the Nix Ecosystem. `GPL-3.0` `Nix`
 - [wildduck](https://wildduck.email/) - Scalable no-SPOF IMAP/POP3 mail server. ([Source Code](https://github.com/nodemailer/wildduck)) `EUPL-1.2` `Node.js`