]> source.dussan.org Git - nextcloud-server.git/commitdiff
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)
1  2 
apps/files/js/files.js
apps/files/templates/index.php

Simple merge
Simple merge