Merge branch 'hotfix/1.1.21' v1.1.21
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 16:05:52 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 16:05:52 +0000 (12:05 -0400)
commit3994baafbed1e4317cbfb4b4a4579049cca55a60
treea83268b624023f9397f4ddc7756621a00cbbb097
parent4390475f06f72b838a6ebb658d90fa5d53bb4f53
parentbbbcf9497288f01fd0bdfa06f58df34cccb2f5ca
Merge branch 'hotfix/1.1.21'