Merge branch 'fix-sorting-in-solr-results' into 'develop'

Use upload date by default and no sorting when query string exists

See merge request !97
3 jobs for develop in 4 minutes and 53 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #2348
build

00:01:15

 
  Layout
passed #2349
layout

00:02:25

 
  Deploy
passed #2350
deploy-develop

00:01:12