[nautilus] (2 commits) Non-fast-forward update to branch 636-default-sort-order-settings-not-respected-in-3-30-no-docs-no-ui-regression-since-3-26

[António Fernandes <antoniof src gnome org>]

The branch '636-default-sort-order-settings-not-respected-in-3-30-no-docs-no-ui-regression-since-3-26' was 
changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  acead3d... file: Sync sort types with settings
  075edd3... gschema.xml: Update default-sort-order's description

Commits added to the branch:

  017ccd2... file: Sync sort types with settings
  6f308f9... gschema.xml: Update default-sort-order's description