Skip to content

Commit 60d269a

Browse files
committed
Merge remote-tracking branch 'origin/develop'
# Conflicts: # config/version.php
2 parents f9b1fdc + e2cb7a0 commit 60d269a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

config/version.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22
return array (
3-
'app_version' => 'v5.0.9',
4-
'full_app_version' => 'v5.0.9 - build 5616-973eacf6c3',
5-
'build_version' => '5616',
3+
'app_version' => 'v5.0.10',
4+
'full_app_version' => 'v5.0.10 - build 5680-gf9b1fdc36',
5+
'build_version' => '5680',
66
'prerelease_version' => '',
7-
'hash_version' => '973eacf6c3',
8-
'full_hash' => 'v5.0.9-87-973eacf6c3',
7+
'hash_version' => 'gf9b1fdc36',
8+
'full_hash' => 'v5.0.10-21-gf9b1fdc36',
99
'branch' => 'master',
1010
);

0 commit comments

Comments
 (0)