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
..
appinfo	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
js	Better feedback for saving calendar and openid settings	2011-09-11 20:38:52 +02:00
templates	correctly detect https	2012-06-01 11:46:18 +02:00
class.openid.v3.php	Experimental OpenID user backend and server.	2011-06-23 17:08:04 +02:00
phpmyid.php	use our own serverHost call so that ownCloud works with reverse proxy servers	2012-05-31 20:26:09 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
user.php	some fixes for contacts, gallery and openid	2012-05-19 15:22:21 +02:00
user_openid.php	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00