From: Felix Pojtinger <felix@pojtinger.com>
Date: Sat, 4 May 2019 12:23:37 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Url: http://these/git/%7B%60%24%7BarchiveUrl%7D/static/%7BfrontRss%7D?a=commitdiff_plain;h=45dd106c13f3976fadab4fdb1e53b6794776303f;p=lemmy.git

Merge branch 'master' into master
---

45dd106c13f3976fadab4fdb1e53b6794776303f
diff --cc README.md
index e56e8680,957462fc..061621ce
--- a/README.md
+++ b/README.md
@@@ -48,9 -45,9 +48,10 @@@ The overall goal is to create an easil
  Each lemmy server can set its own moderation policy; appointing site-wide admins, and community moderators to keep out the trolls, and foster a healthy, non-toxic environment where all can feel comfortable contributing.
  
  ## Why's it called Lemmy?
 +
  - Lead singer from [motorhead](https://invidio.us/watch?v=pWB5JZRGl0U).
  - The old school [video game](<https://en.wikipedia.org/wiki/Lemmings_(video_game)>).
+ - The [Koopa from Super Mario](https://www.mariowiki.com/Lemmy_Koopa).
  - The [furry rodents](http://sunchild.fpwc.org/lemming-the-little-giant-of-the-north/).
  
  Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Inferno](https://www.infernojs.org), [Typescript](https://www.typescriptlang.org/) and [Diesel](http://diesel.rs/).