diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-02 09:58:06 +0400 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-02 09:58:06 +0400 |
| commit | e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3 (patch) | |
| tree | b7d8d913cdf7f4d1ce42f3027918ad0f5fbe5c3b /lib/util.php | |
| parent | 8dd93c8c0288a11f04816bea2a58aee661ef9e97 (diff) | |
| parent | f038cb9aea7c9a1513ab14d0df002773b17d5333 (diff) | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/base.php
Diffstat (limited to 'lib/util.php')
| -rwxr-xr-x | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index f343e783206..0777643a952 100755 --- a/lib/util.php +++ b/lib/util.php @@ -108,7 +108,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(5, 80, 05); + return array(5, 80, 07); } /** |