Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 16:25:08 +0000 (11:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 16:25:08 +0000 (11:25 -0500)
commitd83fcf58551a1e19e8e013e9e88c87a0d2cfadd2
tree6fa0d850510e8d321fb4b3040363990db8a15e58
parent72a30d6c276706bf50bf11a5d410416d7f1cbfc0
parent1746a5888131f8310d983ce89db6d01218d229e5
Merge branch 'hotfix/1.0.21'