Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:28:55 +0000 (09:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:28:55 +0000 (09:28 -0400)
commit7ee97713ff40f61cd3127e1dc9cbb67f9c852641
tree19caf06afc807702f9d2160d03cf048c92a27e83
parente44def2058d5e163c099f00f792d3156ea137760
parent74e121fcf90ef1e59dd711337267f2ed25afca43
Merge branch 'hotfix/1.1.4'