Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Mon, 19 Sep 2016 18:31:10 +0000 (14:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 19 Sep 2016 18:31:10 +0000 (14:31 -0400)
commit8d84e1d4685969cd921e3abcea0c36b519f4017c
tree55298943c266ec38febec5b2122f73e03c9fb046
parent0a5d366adc51a88bc2c79339dbc3d1c790e7ca97
parentf89d3c0729a535abce0d4a072db318cbca7f4a13
Merge branch 'develop' into feature/lauryAdminPolishing
css/admin.css
views/admin/member/index.html
views/admin/members/index.html
views/admin/members/list.html