[network-manager-applet: 2/2] Merge branch 'hard-paths' into 'master'

[Lubomir Rintel <lkundrak src gnome org>]

commit 2c4c69097eddca6c479587435f454de732c9096a
Merge: 5228e3e9 1755a312
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Aug 7 06:46:12 2018 +0000

    Merge branch 'hard-paths' into 'master'
    
    nma/mobile-providers: also use the data file locations from pc files
    
    Closes #14
    
    See merge request GNOME/network-manager-applet!18

 .gitlab-ci.yml                    |  5 +++++
 config.h.meson                    |  3 +++
 configure.ac                      | 23 +++++++++++++++++++++++
 meson.build                       | 10 ++++++++++
 meson_options.txt                 |  1 +
 src/libnma/nma-mobile-providers.c | 10 ++++++++++
 6 files changed, 52 insertions(+)
---