[geary] (6 commits) Non-fast-forward update to branch cherry-pick-423a55b0

[Michael Gratton <mjog src gnome org>]

The branch 'cherry-pick-423a55b0' 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:

  99393b3... Merge branch 'mjog/866-self-signed-certificates' into 'main

Commits added to the branch:

  967f57b... .gitlab-ci.yml: Remove CI jobs after they were removed from (*)
  7f73c5a... ci: flatpak: remove meson-args variable (*)
  a7c36a6... ci: move the bundle var inline the flatpak jbo (*)
  8df89ee... ci: make deps of nightly job explicit (*)
  0b735ac... Merge branch 'mjog/gitlab-ci-3-36' into 'gnome-3-36' (*)
  d4e86dc... Merge branch 'mjog/866-self-signed-certificates' into 'main

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