Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:47:02 +0000 (16:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:47:02 +0000 (16:47 -0400)
commit17dde5614c7b3f70ce4a18f6a9ba6a41f0b12f15
treea1bc576e3835139907745edccdc52431e6d14520
parent5afab2cb23ee0523d7ff4ae8691283fedeae176c
parentbb549622942f956157972ab02527b9f8916f7ee4
Merge branch 'hotfix/1.1.11'