mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 23:54:52 +01:00
Code Issues Projects Releases Wiki Activity
340cb4a04c
mastodon/app/views/admin/pending_accounts
History
Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
..
_account.html.haml Add waiting time to list of pending accounts in admin UI (#10985) 2019-06-07 03:24:10 +02:00
index.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00