[citemplates] (3 commits) Non-fast-forward update to branch abderrahim/config-opts

[Jordan Petridis <jpetridis src gnome org>]

The branch 'abderrahim/config-opts' 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:

  cf4409b... allow overriding the config-opts of the flatpak manifest

Commits added to the branch:

  6309b9b... move flatpak-builder state directory outside of the repo (*)
  185f134... Merge branch 'abderrahim/cache' into 'master' (*)
  4503480... allow overriding the config-opts of the flatpak manifest

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