snipe 97bd87773c Merge branch 'develop' ... # Conflicts: # config/version.php		2018-02-21 02:40:23 -08:00
..
app.php
auth.php	Removed extra commented out crap	2017-01-11 14:54:50 -08:00
broadcasting.php
cache.php
compile.php
database.php
debugbar.php
filesystems.php
image.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
laravel-backup.php
mail.php	Reply to seems to be overwritten	2017-11-03 14:55:03 -07:00
permissions.php	Added Company policy to fix company deletion issue	2018-01-19 17:51:28 -08:00
queue.php
services.php	Fixes #4508 - adds image to location view (and google map, if address and API key exist)	2017-12-01 19:12:35 -08:00
session.php	Change default session name	2017-10-19 06:08:58 -07:00
trustedproxy.php
version.php
view.php