Mastodon

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_actions

…

account_moderation_notes

…

account_warnings

…

accounts

Add batch actions for approving and rejecting pending accounts (#10469 )

2019-04-06 17:53:45 +02:00

action_logs

Use local time in audit log (#10751 )

2019-05-11 06:46:01 +02:00

change_emails

…

custom_emojis

…

dashboard

Fix keybase indication on dashboard

2019-04-19 00:57:39 +02:00

domain_blocks

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-15 17:11:40 +02:00

email_domain_blocks

…

followers

…

instances

…

invites

…

pending_accounts

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-07 17:00:36 +02:00

relays

…

report_notes

…

reports

…

settings

Add site-wide options to show reblogs and replies in local/public timelines

2019-05-01 22:33:09 +02:00

statuses

…

subscriptions

…