Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:34:40 +0000 (13:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:34:40 +0000 (13:34 -0400)
commit4beb1ec0ae01d143bbbe0e32773dc60d83738430
tree178e821d92122322abe4ab855eb8142d983317a6
parent88f6d220c5b844b7c951308d7a597ab566d41212
parent09f88df2127c88b76493b44a2b522e2368cc0c4a
Merge branch 'hotfix/1.0.2'