[dconf: 3/3] Merge branch 'ignore-non-writable' into 'master'

[Daniel Playfair Cal <danielplayfaircal src gnome org>]

commit 0740fd9c28f5cb2cfab634ebdd3c6f4893e2d296
Merge: f0bb97d c963f9e
Author: Daniel Playfair Cal <daniel playfair cal gmail com>
Date:   Tue Feb 12 22:15:56 2019 +0000

    Merge branch 'ignore-non-writable' into 'master'
    
    bin: Add an option to ignore changes to locked keys during load
    
    Closes #1
    
    See merge request GNOME/dconf!43

 bin/dconf.c         | 43 +++++++++++++++++++++++++++++++++++--------
 docs/dconf-tool.xml |  9 ++++++++-
 tests/test-dconf.py | 34 +++++++++++++++++++++++++++-------
 3 files changed, 70 insertions(+), 16 deletions(-)
---