mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 22:26:54 +00:00
c118918520
Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes. |
||
---|---|---|
.. | ||
admin | ||
accounts_helper.rb | ||
application_helper.rb | ||
branding_helper.rb | ||
context_helper.rb | ||
domain_control_helper.rb | ||
email_helper.rb | ||
flashes_helper.rb | ||
formatting_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
languages_helper.rb | ||
mascot_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb | ||
webfinger_helper.rb |