Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 13:34:54 +0000 (09:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 13:34:54 +0000 (09:34 -0400)
commitdf211989a20eda2f5f44540e38af5526003a37aa
tree6e5a5d3fc4913c585972857e203d7a1c4b0740db
parent458109e42feaf1b424c249e1481422315c869ee0
parent212fe7f79c806453a5d1b69c7533a55a3ed389db
Merge branch 'hotfix/1.1.11'