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

Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.
2018-05-21 16:40:02 +02:00
parent 98ecadbf99 46061dc041
commit a4c9bda771
69 changed files with 412 additions and 120 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc4'
+      'rc5'
    end

    def to_a