This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/helpers
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
admin
settings
application_helper.rb
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb Do not error out on unsalvageable errors in FetchRepliesService (#10175) 2019-03-05 15:21:14 +01:00
routing_helper.rb
settings_helper.rb
stream_entries_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00