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

[Philip Chimento <pchimento src gnome org>]

commit 74ad71bfd0f1d54d5be75e965662c17960a8a690
Merge: 30f4979 d72a00e
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Mar 30 04:30:27 2018 +0000

    Merge branch 'master' into 'master'
    
    Update tweener.js -- 48 eslint errors fixed
    
    See merge request GNOME/gjs!112

 modules/tweener/tweener.js | 96 ++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 45 deletions(-)
---