Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md: kept our version

diff --cc CONTRIBUTING.md
index 8044d04f7052d43ba8fc11295dd12b34057a3dc0,65366be5f34d5276d8a509d729a914bd4fd15e01..7eceaf1428c2e31697fc6990e5b16804ccb09790
--- 1/CONTRIBUTING.md
--- 2/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -1,41 -1,7 +1,41 @@@
 +#  Contributing to Mastodon Glitch Edition  #
 +
 +Thank you for your interest in contributing to the `glitch-soc` project!
 +Here are some guidelines, and ways you can help.
 +
 +>   (This document is a bit of a work-in-progress, so please bear with us.
 +>   If you don't see what you're looking for here, please don't hesitate to reach out!)
 +
 +##  Planning  ##
 +
 +Right now a lot of the planning for this project takes place in our development Discord, or through GitHub Issues and Projects.
 +We're working on ways to improve the planning structure and better solicit feedback, and if you feel like you can help in this respect, feel free to give us a holler.
 +
 +##  Documentation  ##
 +
 +The documentation for this repository is available at [`glitch-soc/docs`](https://github.com/glitch-soc/docs) (online at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/)).
 +Right now, we've mostly focused on the features that make this fork different from upstream in some manner.
 +Adding screenshots, improving descriptions, and so forth are all ways to help contribute to the project even if you don't know any code.
 +
 +##  Frontend Development  ##
 +
 +Check out [the documentation here](https://glitch-soc.github.io/docs/contributing/frontend/) for more information.
 +
 +##  Backend Development  ##
 +
 +See the guidelines below.
 +
 + - - -
 +
 +You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `tootsuite/mastodon`, reproduced below.
 +
 +<blockquote>
 +
 +CONTRIBUTING
 +=======
  Contributing
 -============
  
- Thank you for considering contributing to Mastodon 🐘 
+ Thank you for considering contributing to Mastodon 🐘
  
  You can contribute in the following ways:
  

diff --cc lib/mastodon/version.rb
Simple merge