[dia] (6 commits) Non-fast-forward update to branch bilelmoussaoui/flatpak

[Zander <zbrown src gnome org>]

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

  63105c5... Flatpak: bundle pygtk

Commits added to the branch:

  54e780c... Install the desktop file (*)
  dc563ee... Merge branch 'bilelmoussaoui/install-desktop' into 'master' (*)
  0a0ec28... AADL - Box doesn't exist (*)
  5c65e84... Disable tests (*)
  ba44b6d... Merge branch 'bilelmoussaoui/disable-tests' into 'master' (*)
  70880b8... Flatpak: bundle pygtk

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