Merge branch 'master' into release/1.2.39
authorlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 16:14:29 +0000 (11:14 -0500)
committerlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 16:14:29 +0000 (11:14 -0500)
commit1c08e60a9a430b15d59912dcf54edd6a45daf346
tree3acef04e978da750b854affe851d59dcfb000aef
parentb2259805da51fcc82c19f2f0eed26fb43cfb9356
parentc1fc09416a6534866f3c1c8faa7a54e089bfd8a1
Merge branch 'master' into release/1.2.39
css/app.css