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	…
account_interactions_spec.rb	…
remotable_spec.rb	…
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	…