mastodon/app/helpers
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +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 Change OpenGraph description on sign-up page to reflect invite (#11744) 2019-09-03 04:56:54 +02:00
jsonld_helper.rb
routing_helper.rb
settings_helper.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
statuses_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00