]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'unstable'
authorBart Visscher <bartv@thisnet.nl>
Mon, 4 Jun 2012 21:02:05 +0000 (23:02 +0200)
committerBart Visscher <bartv@thisnet.nl>
Mon, 4 Jun 2012 21:02:05 +0000 (23:02 +0200)
commit4a5973662c78eb5769e7b06d7d559572f57e663f
tree774e2f775b3789f5f40bd2459ddec05df1b73c31
parent786325a4bb976d92de54c472c2c3bd8a73cbef22
parent3fee3a4633e5d4d65f7eabf2d387e209efedbc70
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
29 files changed:
apps/files/templates/index.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
apps/gallery/ajax/galleryOp.php
apps/gallery/ajax/sharing.php
apps/gallery/index.php
apps/gallery/lib/album.php
apps/gallery/lib/photo.php
apps/gallery/lib/scanner.php
apps/user_openid/user_openid.php
core/templates/layout.guest.php
core/templates/layout.user.php
lib/app.php
lib/base.php
lib/filesystem.php
lib/group.php
lib/group/backend.php
lib/group/example.php
lib/helper.php
lib/minimizer.php
lib/template.php
lib/user.php
lib/user/backend.php
lib/user/example.php
lib/util.php
remote.php