From cd49f65c0bcc0b95bdb0eb6333f8ebdd5012f016 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@Joeferguson.me>
Date: Fri, 24 Mar 2023 15:27:08 -0500
Subject: [PATCH 1/2] User preflight fix translation strings w/ bad path

---
 resources/views/setup/user.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index a45d37a3e..04c5dfb82 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -1,14 +1,14 @@
 @extends('layouts/setup')
-{{ trans('admin/user/table.createuser') }}
+{{ trans('admin/users/table.createuser') }}
 @section('title')
-{{ trans('admin/user/general.create_user') }} ::
+{{ trans('admin/users/general.create_user') }} ::
 @parent
 @stop
 
 {{-- Page content --}}
 @section('content')
 
-<p>{{ trans('admin/user/general.create_user_page_explanation') }}</p>
+<p>{{ trans('admin/users/general.create_user_page_explanation') }}</p>
 
 <form action="{{ route('setup.user.save') }}" method="POST">
   {{ csrf_field() }}
@@ -156,10 +156,10 @@
 
     <!-- Email credentials -->
     <div class="form-group col-lg-12">
-      <label>{{ trans('admin/user/general.email_credentials') }}</label>
+      <label>{{ trans('admin/users/general.email_credentials') }}</label>
       <div class="checkbox">
         <label>
-          <input type="checkbox" value="1" name="email_creds">{{ trans('admin/user/general.email_credentials_text') }}
+          <input type="checkbox" value="1" name="email_creds">{{ trans('admin/users/general.email_credentials_text') }}
         </label>
       </div>
     </div>
@@ -167,7 +167,7 @@
 @stop
 
 @section('button')
-  <button class="btn btn-primary">{{ trans('admin/user/general.next_save_user') }}</button>
+  <button class="btn btn-primary">{{ trans('admin/users/general.next_save_user') }}</button>
 </form>
 @parent
 @stop

From 6800098469e281bb2723fb911e52efd650500c63 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 28 Mar 2023 03:31:02 -0700
Subject: [PATCH 2/2] Bumped version for 6.1.0-pre

Signed-off-by: snipe <snipe@snipe.net>
---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index da05ee431..fba609ce3 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.14',
-  'full_app_version' => 'v6.0.14 - build 9715-g8b70a7f21',
-  'build_version' => '9715',
+  'app_version' => 'v6.1.0-pre',
+  'full_app_version' => 'v6.1.0-pre - build 10030-gdcbd216e2',
+  'build_version' => '10030',
   'prerelease_version' => '',
-  'hash_version' => 'g8b70a7f21',
-  'full_hash' => 'v6.0.14-671-g8b70a7f21',
+  'hash_version' => 'gdcbd216e2',
+  'full_hash' => 'v6.1.0-pre-986-gdcbd216e2',
   'branch' => 'develop',
 );
\ No newline at end of file