[dia: 4/4] Merge branch 'flatpak' into 'master'

[Zander <zbrown src gnome org>]

commit 7637543cb20d35e18ae1b824f28e3fc3a11016c4
Merge: 2dbbb055 2e864255
Author: Zander <zbrown gnome org>
Date:   Mon May 20 20:47:32 2019 +0000

    Merge branch 'flatpak' into 'master'
    
    Gitlab CI: add flatpak nightlies
    
    Closes #29 and #15
    
    See merge request GNOME/dia!34

 .gitlab-ci.yml                                 |  23 ++++
 build-aux/flatpak/gtk2-use-adwaita-theme.patch |  81 ++++++++++++++
 build-aux/flatpak/org.gnome.Dia.json           | 146 +++++++++++++++++++++++++
 objects/standard/outline.c                     |   1 -
 4 files changed, 250 insertions(+), 1 deletion(-)
---