[NetworkManager-openvpn: 4/4] merge branch 'EmmanuelP:wip/push-peer-info'

[Thomas Haller <thaller src gnome org>]

commit c4ad1b66f090e5a2ae782d7d7067a658587909bd
Merge: 5b038a5 faa15cd
Author: Thomas Haller <thaller redhat com>
Date:   Mon Mar 30 10:02:44 2020 +0200

    merge branch 'EmmanuelP:wip/push-peer-info'
    
    https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/merge_requests/20

 Makefile.am                               |   1 +
 properties/import-export.c                |  10 ++
 properties/nm-openvpn-dialog.ui           | 191 +++++++++++++++++-------------
 properties/nm-openvpn-editor.c            |   9 +-
 properties/tests/conf/push-peer-info.ovpn |   5 +
 properties/tests/test-import-export.c     |  17 +++
 shared/nm-service-defines.h               |   1 +
 shared/utils.h                            |   1 +
 src/nm-openvpn-service.c                  |   5 +
 9 files changed, 154 insertions(+), 86 deletions(-)
---