mastodon/app/helpers
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
admin Add search and sort functions to hashtag admin UI (#11829) 2019-09-16 14:27:29 +02:00
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
domain_control_helper.rb
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316) 2019-07-28 13:48:43 +02:00
routing_helper.rb
settings_helper.rb New Crowdin translations (#11799) 2019-09-16 15:11:01 +02:00
statuses_helper.rb