Skip to content
Permalink
Browse files

Merge branch 'master' into develop

  • Loading branch information
driesvints committed Jan 14, 2020
2 parents 94f8ee3 + 9d0862b commit b1f35786eb6352d1a613ffe0e2b7e55f6e1a316e
Showing with 6 additions and 6 deletions.
  1. +1 −1 .env.example
  2. +1 −1 config/session.php
  3. +2 −2 package.json
  4. +2 −2 resources/lang/en/validation.php
@@ -16,7 +16,7 @@ DB_PASSWORD=
BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=cookie
SESSION_DRIVER=file
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
@@ -18,7 +18,7 @@
|
*/

'driver' => env('SESSION_DRIVER', 'cookie'),
'driver' => env('SESSION_DRIVER', 'file'),

/*
|--------------------------------------------------------------------------
@@ -12,10 +12,10 @@
"devDependencies": {
"axios": "^0.19",
"cross-env": "^5.1",
"laravel-mix": "^4.0.7",
"laravel-mix": "^5.0.1",
"lodash": "^4.17.13",
"resolve-url-loader": "^2.3.1",
"sass": "^1.15.2",
"sass-loader": "^7.1.0"
"sass-loader": "^8.0.0"
}
}
@@ -40,7 +40,7 @@
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values',
'ends_with' => 'The :attribute must end with one of the following: :values.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
@@ -110,7 +110,7 @@
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
],
'starts_with' => 'The :attribute must start with one of the following: :values',
'starts_with' => 'The :attribute must start with one of the following: :values.',
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',

0 comments on commit b1f3578

Please sign in to comment.
You can’t perform that action at this time.