Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 27 May 2016 13:10:47 +0000 (09:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 27 May 2016 13:10:47 +0000 (09:10 -0400)
commit15a228d976a0848a3021b48174e9907ce7d25efe
tree8719ff17ebe8dd8c1de4f29e46920965b4005bbc
parent38f8e8195a93b56d6a46f9b95fb16af04aa64718
parent2eff51277ce285db514989b36e290e229c452e96
Merge branch 'hotfix/1.1.4'