DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 16:27:35 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2021-02-19 10:11:23 -08:00
parent 6449d0aaf9 a5731a3088
commit 54fd1b993b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v5.1.1',
'full_app_version' => 'v5.1.1 - build 5811-',
'build_version' => '5811',
'app_version' => 'v5.1.2-pre',
'full_app_version' => 'v5.1.2-pre - build 5831-g6449d0aaf',
'build_version' => '5831',
'prerelease_version' => '',
'hash_version' => '',
'full_hash' => 'v5.1.1',
'branch' => 'master',
'hash_version' => 'g6449d0aaf',
'full_hash' => 'v5.1.2-pre-17-g6449d0aaf',
'branch' => 'develop',
);