Fix conflict in list view
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Aug 2018 15:54:27 +0000 (11:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Aug 2018 15:54:27 +0000 (11:54 -0400)
commit4687a77d1c1a674a58a9b3c0134d4aff4fdc5824
treeefdba8ab4769894c602f15ecd84128703a23caa9
parentd6be3205737c38a2d0eafc1bbf75ae82dbcc6476
Fix conflict in list view

on develop branch
views/front/members/list.html