]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into encryption_improved_error_messages_4617
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 30 Sep 2013 13:08:53 +0000 (15:08 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 30 Sep 2013 13:08:53 +0000 (15:08 +0200)
commit4d79e7e6733d06da6f4d7f0c44ef95a2a96c4aae
tree5556fd4f3d9c638bb11cdad4c1aed31e09b9263d
parent54965ce065ba7447cee2f4f60fe1babcc7371214
parent480aeb804fc64be6fdcb1551f89e21304e270b33
Merge branch 'master' into encryption_improved_error_messages_4617
apps/files/js/files.js
apps/files/templates/index.php