DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
snipe-it/config
History
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
2021-11-15 19:24:38 -08:00
..
app.php Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
auth.php Default config files 2021-06-10 20:18:10 +00:00
backup.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
broadcasting.php Default config files 2021-06-10 20:18:10 +00:00
cache.php Default config files 2021-06-10 20:18:10 +00:00
compile.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
cors.php Fixed Cors wildcard 2021-06-12 00:23:51 -07:00
database.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
debugbar.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
filesystems.php Fixed filesystem config 2021-06-11 14:26:10 -07:00
hashing.php Added hashing config 2018-07-24 21:13:02 -07:00
image.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
logging.php Default config files 2021-06-10 20:18:10 +00:00
mail-auto-embed.php Fixed #8601 - Switched to “attachment” from “base64” 2020-11-17 14:33:16 -08:00
mail.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
passport.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
permissions.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
queue.php Shift config files 2021-06-10 20:18:10 +00:00
services.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
session.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
trustedproxy.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
version.php Merge remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -08:00
view.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00