David Yip d66192f21c Merge remote-tracking branch 'glitchsoc/master' into gs-master ...

Conflicts:
 	db/schema.rb

2018-04-14 03:50:31 -05:00

..

activitypub

…

admin

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

2018-04-11 00:50:09 +00:00

api

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

2018-04-14 03:50:31 -05:00

auth

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

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

concerns

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

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

oauth

…

settings

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

2018-04-13 16:36:46 -05:00

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

…

application_controller.rb

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

2018-04-03 19:17:20 +00:00

authorize_follows_controller.rb

…

emojis_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

home_controller.rb

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

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

intents_controller.rb

…

invites_controller.rb

…

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

…

statuses_controller.rb

Merge remote-tracking branch 'tootsuite/master'

2018-04-12 03:30:57 -05:00

stream_entries_controller.rb

…

tags_controller.rb

…