diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
| commit | e6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch) | |
| tree | aec719c0af896e1f47c0475f13ed2355dbf34f4f /lib/public/db.php | |
| parent | 8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff) | |
| parent | 17d466b03b91ccc058fe1a88340df36c22a580c2 (diff) | |
| download | nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/public/db.php')
| -rw-r--r-- | lib/public/db.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/db.php b/lib/public/db.php index b9e56985e9d..92ff8f93a22 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -42,7 +42,7 @@ class DB { * SQL query via MDB2 prepare(), needs to be execute()'d! */ static public function prepare( $query, $limit=null, $offset=null ) { - return(\OC_DB::prepare($query,$limit,$offset)); + return(\OC_DB::prepare($query, $limit, $offset)); } /** |