Skip to content

A free open source IT asset/license management system

Merge remote-tracking branch 'origin/develop'

snipe0ea9c0647fe5
diff --cc config/version.php
index 0cd7a8fff4,a88f128345..c21a32ff96
--- a/config/version.php
+++ b/config/version.php
@@@ -1,10 -1,10 +1,10 @@@
<?php
return array (
- 'app_version' => 'v8.3.2',
- 'full_app_version' => 'v8.3.2 - build 19905-g028b4e7b7',
- 'build_version' => '19905',
+ 'app_version' => 'v8.3.3',
+ 'full_app_version' => 'v8.3.3 - build 20061-g884d2a955',
+ 'build_version' => '20061',
'prerelease_version' => '',
- 'hash_version' => 'g028b4e7b7',
- 'full_hash' => 'v8.3.2-319-g028b4e7b7',
+ 'hash_version' => 'g884d2a955',
+ 'full_hash' => 'v8.3.3-154-g884d2a955',
- 'branch' => 'develop',
+ 'branch' => 'master',
);