Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:29:01 +0000 (09:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:29:01 +0000 (09:29 -0400)
commit0b16906b8b714a38a047bedefa71c6a4a6640901
tree19caf06afc807702f9d2160d03cf048c92a27e83
parent2d97dbae5873093eba2757072b96a0b240a19e4c
parent7ee97713ff40f61cd3127e1dc9cbb67f9c852641
Merge tag 'v1.1.4' into develop

v1.1.4