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

Merge branch 'integrations/intermediate-2020-08-31-v5-rc' into develop

Browse source 
# Conflicts:
#	config/version.php
#	public/css/build/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/vue.js
#	public/js/dist/all.js
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/users/index.blade.php
This commit is contained in:
snipe 2020-09-03 09:40:38 -07:00
parent addb2bde23 e321aeabae
commit 9820bc6a58
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v5.0.0-beta-3-rc',
'full_app_version' => 'v5.0.0-beta-3-rc - build 4481-g37568ae9e',
'build_version' => '4481',
'app_version' => 'v5.0.0-beta-3',
'full_app_version' => 'v5.0.0-beta-3 - build 4352-gec723a3da',
'build_version' => '4190',
'prerelease_version' => '',
'hash_version' => 'g37568ae9e',
'full_hash' => 'v5.0.0-beta-3-rc-43-g37568ae9e',
'branch' => 'integrations/rc5-4-2020-08-31-dev-into-master',
);
'hash_version' => 'gec723a3da',
'full_hash' => 'v5.0.0-beta-3-gec723a3da',
'branch' => 'develop',
);