Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:34:31 +0000 (13:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:34:31 +0000 (13:34 -0500)
commitbfbd0d4a4104377b11ac9a616c7a4feda517ead0
tree19966f7b1090fb818faf626a7e9f2e06b334f012
parent9583f78a1f286e05baf402e6765d3f9dbc74ff1d
parent36619b111017ddc79bb9614a041d055e55736e6e
Merge branch 'hotfix/1.1.2'