Merge branch 'hotfix/1.1.6' v1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:08 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:08 +0000 (10:58 -0400)
commit4ea8f845257c679ed4233dbe0a29ed15dbc0630b
treeb6786adf68d368044c061c34653e950f38dd21d8
parent57f0249cfd32dc6e20a2ba2a4a89edb8c747160a
parent35d8cc314f8031860504a220b77eb83ec22fc0a8
Merge branch 'hotfix/1.1.6'