[nautilus] (6 commits) Non-fast-forward update to branch wip/oholy/ci-failures

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

The branch 'wip/oholy/ci-failures' 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:

  ecd346d... progress-info: Prevent abortion caused by missing locks

Commits added to the branch:

  a9cd85a... Conditionally depend on Pango 1.44.4 (*)
  57f6eee... file-operations: Fix conflict dialog for google-drive (*)
  ed2e6c4... Updated Spanish translation (*)
  8df614d... Merge branch 'master' of gitlab.gnome.org:GNOME/nautilus (*)
  2137e57... adwaita.css: pathbar button corner fix (*)
  f3aadd6... progress-info: Prevent abortion caused by missing locks

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