Merge branch 'hotfix/1.1.36' v1.1.36
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:41:30 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:41:30 +0000 (16:41 -0500)
commita49d6addd9837c09e032308965afbf784d3f06ba
tree3f5813ff8f02ab3840efea504e5e04b42fdef1ed
parentf1abea8100fe8ae7e5b55221ddf83672de273c34
parentbdb675e89c055ce165b95516e9da8ef6f8a11475
Merge branch 'hotfix/1.1.36'