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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		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	Sort self-replies to the top of descendants (#9320)	6 years ago
streamable_spec.rb	Add tests for Streamable (#5771)	7 years ago