Merge branch 'hotfix/1.2.36' v1.2.36
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:43:40 +0000 (15:43 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:43:40 +0000 (15:43 -0500)
commit568a21208c3c526e14d23fd5143171983b6ed225
treea3b43972284b2daaf59d950f49ddf7095b9e87dc
parent5a164bdef213acb4b0ea0c09b60d471a5d7a529c
parent735dcd034cf279a95ab72fbf8d832b6676330ab5
Merge branch 'hotfix/1.2.36'