Mastodon

Files

Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

account_actions

…

account_moderation_notes

…

account_warnings

…

accounts

Fix relationships page not showing results in admin UI (#12934 )

2020-01-24 00:20:23 +01:00

action_logs

…

announcements

Add announcements (#12662 )

2020-01-23 22:00:13 +01:00

change_emails

…

custom_emojis

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

2020-01-20 18:31:11 +01:00

dashboard

…

domain_allows

…

domain_blocks

Fix domain block edition in glitch-soc

2019-08-08 09:14:20 +02:00

email_domain_blocks

Various fixes and improvements (#12878 )

2020-01-20 15:55:03 +01:00

instances

Various fixes and improvements (#12878 )

2020-01-20 15:55:03 +01:00

invites

…

pending_accounts

…

relationships

Change followers page to relationships page in admin UI (#12927 )

2020-01-23 20:33:20 +01:00

relays

…

report_notes

…

reports

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

2020-01-20 18:31:11 +01:00

settings

Fix issue because of theming system

2019-12-19 14:42:16 +01:00

statuses

…