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).		2018-11-27 13:23:02 +01:00
..
account_finder_concern_spec.rb	Handle nil and blank cases in Account finders (#3500)	2017-06-01 08:20:36 -04:00
account_interactions_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
remotable_spec.rb	Fix nil host in remotable (#8508)	2018-08-29 21:13:49 +02:00
status_threading_concern_spec.rb	Sort self-replies to the top of descendants (#9320)	2018-11-24 20:48:50 +01:00
streamable_spec.rb	Add tests for Streamable (#5771)	2017-11-24 14:42:57 +01:00