[baobab] (4 commits) Non-fast-forward update to branch wip/exalm/flatpak

[Alexander Mikhaylenko <alexm src gnome org>]

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

  d02545f... flatpak: Add flatpak manifest

Commits added to the branch:

  0d4bca7... icon: update app icon (*)
  8dd5a3b... Merge branch 'wip/jimmac/app-icon-redesign' into 'master' (*)
  7843db1... Update About dialog for new icon design (*)
  3467688... flatpak: Add flatpak manifest

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