Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

activitypub

…

admin

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

api

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

auth

…

concerns

…

oauth

…

settings

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

…

application_controller.rb

…

authorize_follows_controller.rb

…

emojis_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_unfollows.rb

…

shares_controller.rb

…

statuses_controller.rb

…

stream_entries_controller.rb

…

tags_controller.rb

…