Merge branch 'hotfix/1.1.5' v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:36 +0000 (12:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:36 +0000 (12:51 -0400)
commit3a6b783f1da9940ff0f674dc5c5faeb8331ae584
tree3c1e56ce365bafcf70c4a174ca5e95846cbdfbf0
parent15a228d976a0848a3021b48174e9907ce7d25efe
parentbdece118a0cb1caf60a1a294f9ce3e467061b042
Merge branch 'hotfix/1.1.5'