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		2018-08-31 19:10:57 +02:00
..
account_finder_concern_spec.rb
account_interactions_spec.rb
remotable_spec.rb	Fix nil host in remotable (#8508)	2018-08-29 21:13:49 +02:00
status_threading_concern_spec.rb
streamable_spec.rb