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

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb
This commit is contained in:
David Yip
2018-03-27 10:26:47 -05:00
parent 6af17b79c5 40e5d2303b
commit f61aa8e0f7
24 changed files with 151 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/account.rb
View File

@@ -55,7 +55,6 @@ class Account < ApplicationRecord
include AccountHeader
include AccountInteractions
include Attachmentable
include Remotable
include Paginable
MAX_NOTE_LENGTH = 500