Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +01:00

..

about

…

accounts

…

admin

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

2019-02-19 20:18:40 +01:00

admin_mailer

…

application

…

auth

…

authorize_interactions

…

directories

…

errors

…

filters

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

…

media

…

notification_mailer

…

oauth

…

remote_follow

…

remote_interaction

…

remote_unfollows

…

settings

…

shared

…

shares

…

stream_entries

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

2019-03-05 19:23:16 +01:00

tags

…

user_mailer

…

well_known

…