DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2024-05-13 10:53:07 +01:00
parent 4642f50d6b f2dddc1226
commit 6823aabf92
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/codacy-analysis.yml vendored
View file

@ -36,7 +36,7 @@ jobs:
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@v4.4.0
uses: codacy/codacy-analysis-cli-action@v4.4.1
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.4.0',
'full_app_version' => 'v6.4.0 - build 13351-gdb2baae758',
'build_version' => '13351',
'app_version' => 'v6.4.1',
'full_app_version' => 'v6.4.1 - build 13386-g4642f50d6b',
'build_version' => '13386',
'prerelease_version' => '',
'hash_version' => 'gdb2baae758',
'full_hash' => 'v6.4.0-210-gdb2baae758',
'hash_version' => 'g4642f50d6b',
'full_hash' => 'v6.4.1-31-g4642f50d6b',
'branch' => 'master',
);