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 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		7 years ago
..
account_avatar.rb	…
account_finder_concern.rb	…
account_header.rb	…
account_interactions.rb	…
attachmentable.rb	…
cacheable.rb	…
expireable.rb	…
omniauthable.rb	Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)	7 years ago
paginable.rb	…
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Fix nil host in remotable (#8508)	7 years ago
status_threading_concern.rb	…
streamable.rb	…