Merge branch 'develop'

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-05-21 15:43:48 -07:00
commit 2ecc4aead7

View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.4.0', 'app_version' => 'v4.4.1',
'full_app_version' => 'v4.4.0 - build 3630-ge63687579', 'full_app_version' => 'v4.4.1 - build 3636-gece916e12',
'build_version' => '3630', 'build_version' => '3636',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'ge63687579', 'hash_version' => 'gece916e12',
'full_hash' => 'v4.3.0-48-ge63687579', 'full_hash' => 'v4.4.1-54-gece916e12',
'branch' => 'master', 'branch' => 'master',
); );