Skip to content

Commit 34088bc

Browse files
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
2 parents 251851e + 5e2dba5 commit 34088bc

26 files changed

+40
-67
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' => 'v8.1.1',
4-
'full_app_version' => 'v8.1.1 - build 17874-gc031f0b45',
5-
'build_version' => '17874',
3+
'app_version' => 'v8.1.2',
4+
'full_app_version' => 'v8.1.2 - build 17914-g251851ec6',
5+
'build_version' => '17914',
66
'prerelease_version' => '',
7-
'hash_version' => 'gc031f0b45',
8-
'full_hash' => 'v8.1.1-14-gc031f0b45',
7+
'hash_version' => 'g251851ec6',
8+
'full_hash' => 'v8.1.2-32-g251851ec6',
99
'branch' => 'master',
1010
);

public/css/dist/skins/_all-skins.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/_all-skins.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-black-dark.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-black-dark.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-blue-dark.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-blue-dark.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-green-dark.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-green-dark.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/skins/skin-orange-dark.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)