This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/admin/tags
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
..
_tag.html.haml Add batch approve/reject for pending hashtags in admin UI (#11791) 2019-09-09 12:50:09 +02:00
index.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
show.html.haml Fix hashtag link to directory in AdminUI (#12005) 2019-10-01 01:20:22 +02:00