[nautilus] Non-fast-forward update to branch wip/antoniof/flow-box-preparation

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

The branch 'wip/antoniof/flow-box-preparation' 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:

  d64d7d2... general: Rename 'canvas' to 'grid' in enums
  c33cc13... general: Remove canvas view
  b12a13a... global-preferences: Remove now-unused preferences
  c841173... files-view: Drop unused vfunc

Commits added to the branch:

  30ba553... general: Rename 'canvas' to 'grid' in enums