Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge ...

Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml

2018-05-11 18:12:42 +02:00

..

activitypub

Better pagination for ActivityPub outbox (#7356)

2018-05-04 19:19:11 +02:00

admin

Merge branch 'master' into glitch-soc/master

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

api

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

auth

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

concerns

Update session activation time (fixes #5605) (#7408)

2018-05-11 13:20:58 +02:00

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

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

application_controller.rb

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

authorize_follows_controller.rb

…

emojis_controller.rb

…

follower_accounts_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-04 14:16:30 -05:00

following_accounts_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-04 14:16:30 -05:00

home_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

intents_controller.rb

…

invites_controller.rb

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

remote_follow_controller.rb

…

remote_unfollows.rb

Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)

2018-04-08 13:40:22 +02:00

shares_controller.rb

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

statuses_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

stream_entries_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

tags_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00