Merge branch 'develop' into feature/memberDashboard
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 15:07:28 +0000 (11:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 15:07:28 +0000 (11:07 -0400)
commitae5f4f408fcebbba5d41b7d3b6942ac2c338a1f7
treed588c2d4dffacb1cf075c8062d4129c2d3e86083
parente169fd68523b6f1d2d63fedce7dcc0413868169c
parentf49dc83a4644fb233e6d30c0bd774f3c34351a64
Merge branch 'develop' into feature/memberDashboard
css/admin.css
models/admin/dashboardWidget/index.php
models/admin/member/index.php
views/admin/member/index.html