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		6 years ago
..
account_finder_concern_spec.rb	…
account_interactions_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
remotable_spec.rb	Fix nil host in remotable (#8508)	6 years ago
status_threading_concern_spec.rb	Paginate descendant statuses in public page (#7148)	7 years ago
streamable_spec.rb	…