[gnome-software] (3 commits) Non-fast-forward update to branch wip/hughsie/flatpak

[Richard Hughes <rhughes src gnome org>]

The branch 'wip/hughsie/flatpak' 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:

  7ce1c48... Add a flatpak plugin
  7a56d24... trivial: Remove some dead #ifdefs
  0950275... trivial: Switch the example spec file to use flatpak by def

Commits added to the branch:

  6806c8e... Add a flatpak plugin
  7b36d74... trivial: Remove some dead #ifdefs
  4da0833... trivial: Switch the example spec file to use flatpak by def