DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24: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
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2024-09-10 19:00:05 +01:00
parent 713bb104ec 4f0f72b29e
commit a5dbece1a9
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config/version.php
View file

@ -1,10 +1,16 @@
<?php <?php
return array ( return array (
'app_version' => 'v7.0.11', 'app_version' => 'v7.0.12',
'full_app_version' => 'v7.0.11 - build 15044-g46ed07642', 'full_app_version' => 'v7.0.12 - build 15249-g713bb104e',
'build_version' => '15044', 'build_version' => '15249',
'prerelease_version' => '', 'prerelease_version' => '',
<<<<<<< HEAD
'hash_version' => 'g46ed07642', 'hash_version' => 'g46ed07642',
'full_hash' => 'v7.0.11-133-g46ed07642', 'full_hash' => 'v7.0.11-133-g46ed07642',
'branch' => 'master', 'branch' => 'master',
=======
'hash_version' => 'g713bb104e',
'full_hash' => 'v7.0.12-338-g713bb104e',
'branch' => 'develop',
>>>>>>> origin/develop
); );