Merge branch 'release/1.1.0'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 20:30:43 +0000 (15:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 20:30:43 +0000 (15:30 -0500)
commit4fd83ee7f86164b2ba1c1f551f89dd3119ab3153
tree1b48ccd7e6b34d312d4773a005ccc23357e20413
parent463edd4013c05cb3c5d11639d2a322f13449d1d3
parent1dbdbde5565e0db4edb4746d2e5b20fbdceaf191
Merge branch 'release/1.1.0'