snipe 0034938c04 Merge branch 'develop' ... # Conflicts: # config/version.php		2018-02-01 16:32:13 -06:00
..
app.php	Change default log type back to single	2017-11-08 10:58:56 -08:00
auth.php
broadcasting.php
cache.php
compile.php
database.php	Make collation and charset for mysql an env variable	2017-09-26 16:02:55 -07:00
debugbar.php
filesystems.php
image.php
laravel-backup.php	Include oauth keys in backup	2017-09-25 15:45:33 -07:00
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	Fixes explode for trusted proxy	2017-04-27 07:09:23 -07:00
version.php	Merge branch 'develop'	2018-02-01 16:32:13 -06:00
view.php