[nautilus] (2 commits) Non-fast-forward update to branch wip/antoniof/max-width-chars-for-conflict-dialog

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

The branch 'wip/antoniof/max-width-chars-for-conflict-dialog' 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:

  445c6f1... file-conflict-dialog: Set max width for labels
  ed3f08c... properties-window: Truncate name in window title

Commits added to the branch:

  28e4d67... file-conflict-dialog: Set max width for labels
  b3e9405... properties-window: Truncate name in window title