Merge branch 'develop' into feature/adminRevamp
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 4 Apr 2019 17:10:51 +0000 (13:10 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 4 Apr 2019 17:10:51 +0000 (13:10 -0400)
commit6157086daf0e55177d3e925304d53c5a74dc4384
tree0c3ed385ca0f1637f92ce41ef4aa42158c135efc
parent0a214396c517057ad573be3bab7ca0b36e2eb216
parente87f14a1fb748cef8278645cf2895363e5e1229e
Merge branch 'develop' into feature/adminRevamp
controllers/admin.php
views/admin/members/list.html