[gnome-software] (18 commits) Non-fast-forward update to branch 1649-support-appstream-merging

[Milan Crha <mcrha src gnome org>]

The branch '1649-support-appstream-merging' 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:

  f3df5b2... gs-appstream: Add gs_appstream_load_desktop_files()
  cac71ec... gs-plugin-appstream: Use gs_appstream_load_desktop_files()
  f7604d4... gs-flatpak: Use gs_appstream_load_desktop_files()
  a371a3e... gs-plugin-appstream: Move gathering of system appstream dir
  9fef1bc... gs-plugin-appstream: Use a GPtrArray for desktop files dirs
  4739b03... gs-appstream: Add gs_appstream_add_current_locales()
  2597511... gs-plugin-appstream: Use gs_appstream_add_current_locales()
  b9e1f26... gs-flatpak: Use gs_appstream_add_current_locales()
  782b3c5... gs-flatpak: Set GUID on the XbBuilder
  0e79762... gs-details-page: Use gs_appstream_add_current_locales()
  b384ac2... gs-appstream: Add gs_appstream_add_data_merge_fixup()
  0627abd... gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup(
  9e008d6... gs-flatpak: Use gs_appstream_add_data_merge_fixup()

Commits added to the branch:

  46047df... Flatpak manifest: Specify 'main' branch for flatpak.git (*)
  f229bed... Merge branch 'wip/flatpak-manifest' into 'main' (*)
  6e04f5e... Update Indonesian translation (*)
  866f758... Update Friulian translation (*)
  c758670... Update Vietnamese translation (*)
  991ddd6... gs-appstream: Add gs_appstream_load_desktop_files()
  59a33a9... gs-plugin-appstream: Use gs_appstream_load_desktop_files()
  2def082... gs-flatpak: Use gs_appstream_load_desktop_files()
  7c5c572... gs-plugin-appstream: Move gathering of system appstream dir
  299a62a... gs-plugin-appstream: Use a GPtrArray for desktop files dirs
  5d83fbb... gs-appstream: Add gs_appstream_add_current_locales()
  a72e3c5... gs-plugin-appstream: Use gs_appstream_add_current_locales()
  7a0cd52... gs-flatpak: Use gs_appstream_add_current_locales()
  0d0492c... gs-flatpak: Set GUID on the XbBuilder
  162d435... gs-details-page: Use gs_appstream_add_current_locales()
  8333b1f... gs-appstream: Add gs_appstream_add_data_merge_fixup()
  4297554... gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup(
  d96c382... gs-flatpak: Use gs_appstream_add_data_merge_fixup()

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