Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:55:09 +0000 (17:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:55:09 +0000 (17:55 -0400)
commit02875742f7bdacddfed4ce076507f776c4041953
tree874a7a71b18febcd45ef6560063a0faf154d51a6
parent55ad70140a6bb61f4ac819b3feb9416bc7e85ef2
parent8e28ba714cd623e1ea5b0a0865efc1e96f1a182d
Merge branch 'hotfix/1.0.36'