Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Thu, 1 Sep 2016 15:42:51 +0000 (11:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 1 Sep 2016 15:42:51 +0000 (11:42 -0400)
commit0a5d366adc51a88bc2c79339dbc3d1c790e7ca97
tree9a6fc248426ced00ecd6c9fe93eb52c39f47964e
parent7a1825dc9c31d89793b488c92db7ffc9d6ec69c5
parent0b1039845c0e98984d5dd9750b01aa7176ca466d
Merge branch 'develop' into feature/lauryAdminPolishing
css/admin.css
views/admin/members/index.html