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
..
assets	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
lang	Added the current_value string to correspondig 'en' language directory	2021-11-11 14:43:47 -06:00
macros	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]	2021-08-17 21:59:33 -07:00
views	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00