[gjs: 2/2] Merge branch 'master.msvc' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit b537bd7fa95fd533eac2d6898f00bda714b89cfe
Merge: 32916c26 da7e548f
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Jun 1 15:51:18 2020 +0000

    Merge branch 'master.msvc' into 'master'
    
    arg.cpp: Add required messages for static_assert (fix building on pre-C++17)
    
    See merge request GNOME/gjs!441

 gi/arg.cpp  | 6 ++++--
 meson.build | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)
---