tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/tags
History
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
..
_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-18 17:25:56 +02:00
show.html.haml Change the hashtag link from WebUI to public page (#11845) 2019-09-15 15:48:00 +02:00