[nautilus] (2 commits) Non-fast-forward update to branch 790-freeze-when-restoring-file-from-trash-if-file-with-same-name-and-location-exists

[Ondrej Holy <oholy src gnome org>]

The branch '790-freeze-when-restoring-file-from-trash-if-file-with-same-name-and-location-exists' 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:

  4fc4d09... file-utilities: Don't block main thread to restore from tra

Commits added to the branch:

  ca6d56f... Revert "file: use emblems for files that use default icon" (*)
  9fc4fa9... file-utilities: Don't block main thread to restore from tra

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