Merge branch 'hotfix/1.2.2' V1.2.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:23:52 +0000 (16:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:23:52 +0000 (16:23 -0400)
commit84df9dd8e74800dd030f8c3b06b4f46d5c89567b
tree17c5841476b7f06f2020cd025e927eaf52c98688
parent177a262810a8849420d837a4b802e170ecabf5ec
parent54c6bebaca1e4d72b76af447c177a4a745f86afd
Merge branch 'hotfix/1.2.2'