Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json
snipe · Oct 6, 2023 · d9a1dab · d9a1dab
2 parents a95fae0 + 5277f7c
commit d9a1dab
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
- 'app_version' => 'v6.2.1',
- 'full_app_version' => 'v6.2.1 - build 11625-gc45ede2d1',
- 'build_version' => '11625',
+ 'app_version' => 'v6.2.2',
+ 'full_app_version' => 'v6.2.2 - build 11714-ga95fae0e9',
+ 'build_version' => '11714',
  'prerelease_version' => '',
- 'hash_version' => 'gc45ede2d1',
- 'full_hash' => 'v6.2.1-47-gc45ede2d1',
+ 'hash_version' => 'ga95fae0e9',
+ 'full_hash' => 'v6.2.2-85-ga95fae0e9',
  'branch' => 'master',
 );
diff --git a/public/css/build/app.css b/public/css/build/app.css