diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
| commit | f1518a54dffb4a309da3952e154b71d4bc9482f8 (patch) | |
| tree | b6faeec269eb8904c5c8f42732e5466758fdeb0e /tests/lib/app.php | |
| parent | 65d802329f8307cd010a306073d2d3ffd7dc7b74 (diff) | |
| parent | de949b1caa4491a8016ed5e609fc781526fea54d (diff) | |
| download | nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.tar.gz nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.zip | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
Diffstat (limited to 'tests/lib/app.php')
| -rw-r--r-- | tests/lib/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lib/app.php b/tests/lib/app.php index 5396db8143e..52eade90a6e 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -79,4 +79,4 @@ class Test_App extends PHPUnit_Framework_TestCase { $this->assertFalse(OC_App::isAppVersionCompatible($oc, $app)); } -}
\ No newline at end of file +} |