Merge branch 'hotfix/1.2.5'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:27:57 +0000 (12:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:27:57 +0000 (12:27 -0400)
commit9d7f985a55796b03d67dd536cc78fcde67b3a8e6
treeda37a8ec70f1e81580074e2c5256d6e44ceb5169
parent4a516e4f0efe9851301c812ff08f84abd5c04c24
parenteb130189d64fe3382eaf0ae6c5bcaa76df57fbea
Merge branch 'hotfix/1.2.5'