Merge branch 'hotfix/1.1.18'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:03:44 +0000 (11:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:03:44 +0000 (11:03 -0500)
commit4a0ef6e3b99de0a018c1ad21489bae00c8ce68d1
tree8a63e0392db51c1cff3e400b88c6396586f84d6a
parent71c840e6ab929e9e2f85e7df6346f29bfad2b88c
parent7c60e10b93d5db625591a63b32b0b3157401f764
Merge branch 'hotfix/1.1.18'