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

2019-01-20 16:49:23 +01:00
parent aa362ab73d 31e7940de5
commit 9dfbcf941e
37 changed files with 492 additions and 64 deletions
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -5,6 +5,9 @@ namespace :repo do
  task :authors do
    file = File.open(Rails.root.join('AUTHORS.md'), 'w')
    file << <<~HEADER
+      Authors
+      =======
+
      Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
      and provided thanks to the work of the following contributors: