Merge branch 'develop'

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-07-09 19:07:49 -07:00
commit fad84d4437

View file

@ -1,8 +1,8 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.4.2', 'app_version' => 'v4.4.2',
'full_app_version' => 'v4.4.2 - build 3666-gaa5003d29', 'full_app_version' => 'v4.4.2 - build 3701-gbf1e742df',
'build_version' => '3666', 'build_version' => '3701',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'gaa5003d29', 'hash_version' => 'gaa5003d29',
'full_hash' => 'v4.4.2-28-gaa5003d29', 'full_hash' => 'v4.4.2-28-gaa5003d29',