[nautilus] (15 commits) Non-fast-forward update to branch wip/csoriano/flow

[Carlos Soriano <csoriano src gnome org>]

The branch 'wip/csoriano/flow' 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:

  fe38050... views: Add flow box based view
  18e963d... f

Commits added to the branch:

  21bc97b... Add building with flatpak (*)
  e9e33de... Revert "Add building with flatpak" (*)
  3e3bafe... build: add Flatpak development build (*)
  171bf2a... general: track .gitignore (*)
  5f1fd25... gitignore: ignore .flatpak-builder (*)
  3aaecde... gitignore: ignore m4 directory (*)
  fbe174d... gitignore: ignore gtk-doc generated files (*)
  c368108... gitignore: ignore gnome-builder build configurations (*)
  8287957... Revert "gitignore: ignore gnome-builder build configuration (*)
  3a010a9... Revert "gitignore: ignore gtk-doc generated files" (*)
  2ddf64b... Revert "gitignore: ignore m4 directory" (*)
  4534fe5... Revert "gitignore: ignore .flatpak-builder" (*)
  c634071... Revert "general: track .gitignore" (*)
  4f2d1d7... views: Add flow box based view
  5eb2189... f

(*) This commit already existed in another branch; no separate mail sent