Merge branch 'develop' into feature/frontCalendar
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 25 Aug 2016 18:37:54 +0000 (14:37 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 25 Aug 2016 18:37:54 +0000 (14:37 -0400)
commit80c39194dd3412e9f432d98dc1b54912e32b2eaa
treead10fbaeb08f15fa180c32c590261891045945b2
parentbeb9fb50b5137c2d82fe5ccba024653a8b4ca20e
parentc6ab94483b4077947619146a9a39776ca6985dde
Merge branch 'develop' into feature/frontCalendar

Conflicts:
activate.php
activate.php
classes/data/dataManagement.php
index.php
models/admin/management/events.php
models/front/events/list.php
setup/databaseScripts/create_database_V0.0.20.sql
setup/databaseScripts/create_database_V0.0.21.sql
setup/databaseScripts/dbVersions.php
setup/databaseScripts/update_database_V0.0.21.sql
views/admin/management/events.html
views/front/events/agenda.html