This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
chewy	Full-text search for authorized statuses (#6423)	2018-02-09 23:04:47 +01:00
controllers	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
helpers	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
javascript	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
mailers	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
models	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
policies	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
presenters	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-04 18:17:32 +00:00
serializers	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-16 21:52:38 +02:00
validators	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
views	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
workers	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00