Merge branch 'master' into sqlite-pk-fix

owncloud-archive · Jan 30, 2014 · 3d42b54 · 3d42b54
2 parents b4db0b3 + 7c2c94c
commit 3d42b54
Show file tree

Hide file tree

Showing 584 changed files with 119,970 additions and 52,314 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-.DS_Store
+.DS_Store
+bin
+
diff --git a/LICENSE INFO b/LICENSE INFO
@@ -18,10 +18,9 @@ miniColors - GPL / MIT
 openid - GPLv3
 OS - New BSD License
 PEAR - Simplified BSD License
-php-cloudfiles - MIT
 phpass - Public domain
 Sabre - New BSD License
 smb4php - GPL
 System.php - New BSD License
 timepicker - GPL / MIT
-XML - New BSD License
+XML - New BSD License