Merge branch 'develop' into feature/adminRevamp
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Dec 2018 14:43:45 +0000 (09:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Dec 2018 14:43:45 +0000 (09:43 -0500)
commitfb4fa1fc0863631efc095b81df2103b9bfe978fc
treea9502115067428102cca7d34f3f0e4a6a0074d53
parent55a34a95ddf9cceb7c1c5db2ee189cbf1a45b4ea
parent1f50aef64aa903d9ba0b6ca4e0d5316574f5d457
Merge branch 'develop' into feature/adminRevamp
models/admin/events/list.php