Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:35 +0000 (09:13 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:35 +0000 (09:13 -0500)
commit29ac1bb5fd6680fdf506e296ef7ed7e8f585f12f
tree03730c0196ca4134c44f7f7820cd996ddacbf1d7
parent868302a88aa25bd6bec5334bff8a57dc79ac2139
parent788b26694a21016b33fc0033356df997d6224569
Merge branch 'hotfix/1.1.4'