From ca8e65c66869a5920f51a10138f6e70daf86f001 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Apr 2017 10:14:59 -0300
Subject: [PATCH] Updates services and research

---
 research.mdwn | 2 ++
 services.mdwn | 1 +
 2 files changed, 3 insertions(+)

diff --git a/research.mdwn b/research.mdwn
index 6fdcfef..cbc3913 100644
--- a/research.mdwn
+++ b/research.mdwn
@@ -28,6 +28,8 @@ Raw list with things to try, research, evaluate develop and maybe deploy!
 * https://github.com/gorhill/uMatrix
 * https://github.com/metabase/metabase
 * https://lede-project.org/start
+* https://github.com/shadowsocks/shadowsocks-go
+* https://botman.io
 
 ## Multimedia
 
diff --git a/services.mdwn b/services.mdwn
index 36d9140..af7d6f9 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -108,6 +108,7 @@ Social media
 * [Incoma](https://github.com/Incoma/Incoma).
 * [Sneer](https://github.com/klauswuestefeld/sneer).
 * [Noosfero](http://noosfero.org/).
+* [Mastodon](https://mastodon.social).
 * Democracia: [Liquid Democracy](https://wiki.piratenpartei.de/Liquid_Democracy) / [Liquid Feedback](http://liquidfeedback.org).
 * [Briar](http://briar.sourceforge.net).
 * [Twister](http://twister.net.co/).
-- 
GitLab