[nautilus] (7 commits) 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:

  8322f2a... view-icon-controller: Implement captions
  3760fe9... view-icon-controller: Store vadjustment pointer
  4ebfb72... view-icon-controller: Implement thumbnailing prioritization
  30ba553... general: Rename 'canvas' to 'grid' in enums
  66955e6... general: Remove canvas view
  a5dbbf0... global-preferences: Remove now-unused preferences
  e8e48c9... files-view: Drop unused vfunc

Commits added to the branch:

  51482c4... view-icon-controller: Implement captions
  e0ec000... view-icon-controller: Store vadjustment pointer
  02ab6b2... view-icon-controller: Implement thumbnailing prioritization
  80c1ff8... general: Rename 'canvas' to 'grid' in enums
  b7ec077... general: Remove canvas view
  1af6fbd... global-preferences: Remove now-unused preferences
  ea737c0... files-view: Drop unused vfunc