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

about

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

2019-11-23 19:03:01 +01:00

accounts

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

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

admin

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

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

admin_mailer

…

application

…

auth

…

authorize_interactions

…

directories

…

errors

…

filters

Various fixes and improvements (#12878 )

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

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Merge branch 'master' into glitch-soc/master

2020-01-20 15:00:22 +01:00

media

…

notification_mailer

…

oauth

…

public_timelines

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

2019-11-06 14:38:28 +01:00

relationships

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

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

remote_follow

…

remote_interaction

…

settings

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

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

shared

…

statuses

Merge branch 'master' into glitch-soc/master

2020-01-20 15:00:22 +01:00