Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Fri, 7 Apr 2017 13:23:21 +0000 (09:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 7 Apr 2017 13:23:21 +0000 (09:23 -0400)
commit4dadd160b461b458bc1465d4dcc59b2f1a0aaf30
tree81b5a71abebf6c19f4006a0eba9ba104e278aed3
parent5c08d4ed2361f56e255a8af6c222bb5cf057bad8
parent0a5c9f405eca1b51c194cc4ba76f2dedf4f21952
Merge branch 'develop' into feature/lauryAdminPolishing
css/admin.css
views/admin/dashboardWidget/index.html
views/admin/management/index.html
views/admin/member/memberInfo.html
views/admin/member/memberInfo/editLocation.html
views/admin/members/index.html
views/admin/settings/header.html