Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 27 May 2016 13:10:55 +0000 (09:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 27 May 2016 13:10:55 +0000 (09:10 -0400)
commitc7e0608a50b9ac8575882dcafbe6050f5cb2ab3a
tree76db9e699f45cdcd4e32566ac566be18290711b2
parent7d240666ea7592fa299f3915ae5fb6faf7397e6f
parent15a228d976a0848a3021b48174e9907ce7d25efe
Merge tag 'v1.1.4' into develop

v1.1.4