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

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

Paginate descendant statuses in public page (#7148)

2018-04-23 19:27:35 +02:00

streamable_spec.rb

Add tests for Streamable (#5771)

2017-11-24 14:42:57 +01:00