Merge branch 'develop' into feature/adminRevamp
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Nov 2018 14:24:57 +0000 (09:24 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Nov 2018 14:24:57 +0000 (09:24 -0500)
1  2 
models/admin/events/list.php

Simple merge