Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 20:46:34 +0000 (15:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 20:46:34 +0000 (15:46 -0500)
commit6c3e89ac5c25fa926182f0ffaf718439651dfea4
tree2ab63011a57234ffb76b91d232320e0cdbf8431c
parentc36bb1ce3eb4c5f89d514de12119e856165f9b5a
parent4d0734ccfde54bc018439efffb55c86b22a718a4
Merge branch 'hotfix/1.1.2'