Merge branch 'develop'

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-07-09 19:21:23 -07:00
commit 52d605d13e

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.4.2',
'full_app_version' => 'v4.4.2 - build 3701-gbf1e742df',
'app_version' => 'v4.5.0',
'full_app_version' => 'v4.5.0 - build 3701-gbf1e742df',
'build_version' => '3701',
'prerelease_version' => '',
'hash_version' => 'gaa5003d29',
'full_hash' => 'v4.4.2-28-gaa5003d29',
'hash_version' => 'gbf1e742df',
'full_hash' => 'v4.4.2-63-gbf1e742df',
'branch' => 'master',
);