You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		6 years ago
..
about	…
accounts	…
admin	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
admin_mailer	…
application	…
auth	…
authorize_follows	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
shared	…
shares	…
stream_entries	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
tags	…
user_mailer	…
well_known	…