aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-04-04 10:14:59 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-04-04 10:14:59 -0300
commitca8e65c66869a5920f51a10138f6e70daf86f001 (patch)
tree15d9cbe5d25965a961214999ea870f3b1e1045a8
parent2a6d03e7a63061ead98be646fa576465edec75ad (diff)
downloadblog-ca8e65c66869a5920f51a10138f6e70daf86f001.tar.gz
blog-ca8e65c66869a5920f51a10138f6e70daf86f001.tar.bz2
Updates services and research
-rw-r--r--research.mdwn2
-rw-r--r--services.mdwn1
2 files changed, 3 insertions, 0 deletions
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/).