Merge remote-tracking branch 'origin/feature/anthony' into feature/EventsIntegration
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Mar 2016 14:52:10 +0000 (09:52 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Mar 2016 14:52:10 +0000 (09:52 -0500)
commit61a19972c35456946b2fc91799dd1e3e7ce09bff
tree3e19b2774888bad5014903e9a2bf2eb08eed9d9c
parent01fa16c204039ae079e2b354437cf567cf0753f4
parentc63d55b3e0a60f663ec2f3449fb9725314cea241
Merge remote-tracking branch 'origin/feature/anthony' into feature/EventsIntegration

Conflicts:
views/admin/events/header.html
views/admin/events/index.html
views/admin/member/events.html
setup/validActions.php
views/admin/events/header.html
views/admin/member/events.html