Merge branch 'hotfix/1.3.6' V1.3.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:08:41 +0000 (09:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:08:41 +0000 (09:08 -0400)
commitaa3ab5418b92e2e366c1e57deafee2e2ba7622f1
treead4c9896fbcc00d095dc4a59e149b174c98fab16
parentf88768ed5490c608ffdee822617b7c7b66149743
parent2c221d41a9734d05213756ae651f9289372770ce
Merge branch 'hotfix/1.3.6'