From a8acf042c392a41f92fefd8b7951381ffe4d6589 Mon Sep 17 00:00:00 2001
From: Johannes Ernst <Johannes.Ernst@gmail.com>
Date: Fri, 7 Jul 2017 20:12:40 -0700
Subject: [PATCH] Added Mastodon

---
 _posts/2017-07-08-mastodon.markdown | 17 +++++++++++++++++
 products.md                         | 11 +++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 _posts/2017-07-08-mastodon.markdown

diff --git a/_posts/2017-07-08-mastodon.markdown b/_posts/2017-07-08-mastodon.markdown
new file mode 100644
index 0000000..af415b9
--- /dev/null
+++ b/_posts/2017-07-08-mastodon.markdown
@@ -0,0 +1,17 @@
+---
+layout: post
+title:  "Mastodons is a free, open-source social etnwork"
+date:   2017-07-08 03:09:18 +0000
+categories: update
+---
+
+Wouldn't social media be great if the social media sites didn't all track your every move,
+sell out your data to the highest bidder, and bombard you with ads? There are alternatives,
+such as Mastodon.
+
+Based on the open GNU Social protocol, you can set up your own instance of Mastodon for
+your friends and family, and still connect with anybody else, even if they are not using
+your website. And if you are used to Twitter, you will feel right at home.
+
+Go to the <a href="/products/#Mastodon">Mastodon</a> listing.
+
diff --git a/products.md b/products.md
index 9c86cc1..369f67c 100644
--- a/products.md
+++ b/products.md
@@ -173,4 +173,15 @@ Your listing MAY also include (encouraged, not required):
    vendorname="Community"
 %}
 
+{% include product-line.html
+   productname="Mastodon"
+   producturl="https://mastodon.social/"
+   productimgurl="https://assets.mastodon.social/packs/logo-1c01b10e55cd17e27a4df85991e030d9.png"
+   productdescription="Free, open-source social network"
+   producttype="Server-side app"
+   productlicenseorcost="AGPLv3"
+   vendorname="Community"
+   vendorurl="https://github.com/orgs/tootsuite/people"
+%}
+
 </table>