Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:13 +0000 (12:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:13 +0000 (12:46 -0400)
commita45a64867297826b0d05dfc7a43b138cd1c241fc
tree9e69f92d640cc5f87d0714b2dc9dced4c10afc5e
parent2264d704568173503d17c3642684631c8b97c007
parentfbed8bbda4c816728f5019676ec198b6bd0aa8da
Merge tag 'v1.1.4' into develop

v1.1.4