From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 26 Jun 2018 15:12:20 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.20'
X-Git-Tag: v1.0.20^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fc997f0fdef8eb8f7d89ddcb9f7e5431ef3042c3;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.20'
---

fc997f0fdef8eb8f7d89ddcb9f7e5431ef3042c3