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

..

activitypub

…

admin

…

api

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

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

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

…

application_controller.rb

…

authorize_interactions_controller.rb

…

custom_css_controller.rb

…

directories_controller.rb

…

emojis_controller.rb

…

filters_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

home_controller.rb

…

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

remote_follow_controller.rb

…

remote_interaction_controller.rb

…

remote_unfollows_controller.rb

…

shares_controller.rb

…

statuses_controller.rb

…

stream_entries_controller.rb

…

tags_controller.rb

…