Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
  • Loading branch information
snipe committed Jun 17, 2024
2 parents b1f2051 + 60accfd commit 069a160
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions config/version.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v7.0.0',
'full_app_version' => 'v7.0.0 - build 13553-g9fccafa3a',
'app_version' => 'v7.0.1',
'full_app_version' => 'v7.0.1 - build 13553-g9fccafa3a',
'build_version' => '13553',
'prerelease_version' => '',
'hash_version' => 'g9fccafa3a',
'full_hash' => 'v7.0.0-51-g9fccafa3a',
'full_hash' => 'v7.0.1-51-g9fccafa3a',
'branch' => 'master',
);

0 comments on commit 069a160

Please sign in to comment.