mastodon/app/helpers
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
..
admin Add dormant filter to relationship manager, rename other filters (#10308) 2019-03-18 03:53:17 +01:00
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
flashes_helper.rb
home_helper.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
instance_helper.rb
jsonld_helper.rb Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00
routing_helper.rb
settings_helper.rb I18n: Add language options for Kazakh and Lithuanian (#10104) 2019-02-23 22:20:35 +01:00
stream_entries_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00