Commit Graph

6 Commits

Author SHA1 Message Date
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Sam Tuke 4b4d13165a Minor change to comment 2012-06-01 16:46:18 +01:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Bart Visscher ac2e0cd6e4 Implement default functions in OC_User backend
Simplifies calling these functions, and makes code simpler

functions:
deleteUser
getUsers
userExists
2012-05-10 09:14:26 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack f5c0dbd947 Use autoload 2011-07-27 19:07:28 +02:00