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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Show exact number of followers/statuses on export page/in tooltip (#8199)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
auth	Redesign public profiles and toots (#8068)	6 years ago
authorize_follows	Redesign public profiles and toots (#8068)	6 years ago
errors	…
filters	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
follower_accounts	Redesign public profiles and toots (#8068)	6 years ago
following_accounts	Redesign public profiles and toots (#8068)	6 years ago
home	…
invites	Add autofollow option to invites (#7805)	7 years ago
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	Redesign public profiles and toots (#8068)	6 years ago
remote_unfollows	Redesign public profiles and toots (#8068)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	…
user_mailer	…
well_known	…