server/lib/user
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
..
backend.php Merge branch 'unstable' 2012-06-04 23:02:05 +02:00
database.php update copyright 2012-05-26 19:14:24 +02:00
dummy.php update copyright 2012-05-26 19:14:24 +02:00
example.php Merge branch 'unstable' 2012-06-04 23:02:05 +02:00
http.php http user backend 2012-06-03 02:51:05 +02:00