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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		6 years ago
..
account_avatar.rb	…
account_finder_concern.rb	…
account_header.rb	Redesign public profiles and toots (#8068)	6 years ago
account_interactions.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
attachmentable.rb	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)	7 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
expireable.rb	Keyword/phrase filtering (#7905)	7 years ago
omniauthable.rb	…
paginable.rb	…
relationship_cacheable.rb	…
remotable.rb	Fix fetch of remote image with multiple Content-Type headers (#7749)	7 years ago
status_threading_concern.rb	Fix context performance by partially reverting #7083 (#7734)	7 years ago
streamable.rb	…