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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
account_associations.rb	…
account_avatar.rb	…
account_counters.rb	…
account_finder_concern.rb	…
account_header.rb	…
account_interactions.rb	…
attachmentable.rb	…
cacheable.rb	…
domain_normalizable.rb	…
expireable.rb	…
ldap_authenticable.rb	…
omniauthable.rb	…
paginable.rb	…
pam_authenticable.rb	…
redisable.rb	…
relationship_cacheable.rb	…
remotable.rb	…
status_threading_concern.rb	…
user_roles.rb	…