Merge branch 'develop'

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2017-12-12 09:25:45 -08:00
commit 5204e84703

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.1.8-pre',
'full_app_version' => 'v4.1.8-pre - build 3068-gceca76b',
'build_version' => '3068',
'full_app_version' => 'v4.1.8-pre - build 3103-geb827cd',
'build_version' => '3103',
'prerelease_version' => '',
'hash_version' => 'gceca76b',
'full_hash' => 'v4.1.7-34-gceca76b',
'hash_version' => 'geb827cd',
'full_hash' => 'v4.1.7-69-geb827cd',
'branch' => 'master',
);