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 Jul 29, 2024
2 parents c2bcc2e + 33b8605 commit 3972782
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 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.9',
'full_app_version' => 'v7.0.9 - build 14485-ga98ad76c6',
'build_version' => '14485',
'app_version' => 'v7.0.10',
'full_app_version' => 'v7.0.10 - build 14684-gc2bcc2e2d',
'build_version' => '14684',
'prerelease_version' => '',
'hash_version' => 'ga98ad76c6',
'full_hash' => 'v7.0.9-112-ga98ad76c6',
'hash_version' => 'gc2bcc2e2d',
'full_hash' => 'v7.0.10-311-gc2bcc2e2d',
'branch' => 'master',
);

0 comments on commit 3972782

Please sign in to comment.