Merge branch 'hotfix/1.2.6'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:52:15 +0000 (12:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:52:15 +0000 (12:52 -0400)
commitd3e77a4731775f86fdf0e9881ad4c8b5a02c91de
tree8a86a61d0dffd8ad2d0fec458c920d8ca8a99af4
parent9d7f985a55796b03d67dd536cc78fcde67b3a8e6
parent6282c49e9563e5ea97e134d945de8c6cedec440e
Merge branch 'hotfix/1.2.6'