Merge branch 'hotfix/1.1.0' v1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 15:03:30 +0000 (10:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 15:03:30 +0000 (10:03 -0500)
commitc4c4be5943e7936afd4909af37f9537491830c3a
tree49ae193d305d3c9f137cdd84703f9dfabbd21daa
parent2b1b191a12bd5f9d52ca465334fca9018364ad8d
parent74f4e2a4cdfb9e22318fb486a9d836b372d68a9c
Merge branch 'hotfix/1.1.0'