Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		2019-07-30 12:22:33 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
admin_mailer
application	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
auth	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
authorize_interactions	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
media
notification_mailer
oauth	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
public_timelines
relationships
remote_follow
remote_interaction	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
settings	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
shared
shares
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02:00
tags
user_mailer
well_known	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00