Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Thibaut Girka
2019-02-01 16:12:20 +01:00
parent f611da4899 3de63b3c35
commit e87bd6d94a
46 changed files with 259 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/stream_entries_helper.rb
View File

@@ -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'