[gjs: 2/2] Merge branch 'gbsneto/issue-171' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 29a91bfab12fad27757d0e9a64b34891c6567d8d
Merge: 8d4d6fdd f6758a3c
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Jul 9 16:34:26 2018 +0000

    Merge branch 'gbsneto/issue-171' into 'master'
    
    object: Add GObject properties to the correct prototype
    
    Closes #171
    
    See merge request GNOME/gjs!188

 gi/object.cpp                          | 14 ++++----------
 installed-tests/js/testGObjectClass.js | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)
---