Merge branch 'hotfix/1.1.3'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:07:10 +0000 (15:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:07:10 +0000 (15:07 -0400)
commit16b49e3b573d47a5c9b137bc6c8b8b921d457e28
tree4c2bdd1585faf86361eb4f9b9805b16d70e30870
parent16e4c423780fc6eedea8282e1d7c169e867c7811
parent5a215a0b40162bdbb98a74d2a2d4de5180acfba3
Merge branch 'hotfix/1.1.3'