Merge tag 'v2.10.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Nov 2017 18:51:19 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Nov 2017 18:51:19 +0000 (14:51 -0400)
Version 2.10.17

1  2 
index.php
models/admin/member/memberEdit.php

diff --cc index.php
Simple merge
Simple merge