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 |
||
---|---|---|
.. | ||
appinfo | ||
js | ||
templates | ||
class.openid.v3.php | ||
phpmyid.php | ||
settings.php | ||
user.php | ||
user_openid.php |