[nautilus] (2 commits) Non-fast-forward update to branch 1841-crashing-when-copying-folder-with-same-name-and-click-to-rename

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

The branch '1841-crashing-when-copying-folder-with-same-name-and-click-to-rename' 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:

  87bb1b9... file-conflict-dialog: Fix crash on extensionless filenames
  4f78376... eel-vfs-extensions: Document get_extension_offset

Commits added to the branch:

  4a99c7e... file-conflict-dialog: Fix crash on extensionless filenames
  bdde511... eel-vfs-extensions: Document get_extension_offset