]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflict
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 31 Jan 2013 09:55:59 +0000 (10:55 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 31 Jan 2013 09:55:59 +0000 (10:55 +0100)
commit54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7
tree48c2eb0ad04a4bd921f223258e41beba2e2c6539
parent9c83b307f6d49f30c4cc6db7258d7e3851bac0b7
parent00a30e665128352e9b20268ea65400a968903c74
fix merge conflict
apps/files/css/files.css
apps/files/index.php
apps/files/js/files.js