Merge tag 'v2.10.20' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 18:32:52 +0000 (13:32 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 18:32:52 +0000 (13:32 -0500)
Version 2.10.20

1  2 
index.php
models/admin/members/list.php

diff --cc index.php
Simple merge
Simple merge