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

Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes
2019-02-01 16:12:20 +01:00
parent f611da4899 3de63b3c35
commit e87bd6d94a
46 changed files with 259 additions and 116 deletions
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@ -176,7 +176,7 @@ module StreamEntriesHelper
    when 'public'
      fa_icon 'globe fw'
    when 'unlisted'
-      fa_icon 'unlock-alt fw'
+      fa_icon 'unlock fw'
    when 'private'
      fa_icon 'lock fw'
    when 'direct'