mastodon/app/helpers
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +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 Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
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 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 Add br, es-AR, et, mk, nn to available locales (#12062) 2019-10-03 03:59:43 +02:00
statuses_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00