]> source.dussan.org Git - nextcloud-server.git/commit
resolve merge conflicts
authorArthur Schiwon <blizzz@owncloud.com>
Wed, 25 Apr 2012 22:14:21 +0000 (00:14 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Wed, 25 Apr 2012 22:14:21 +0000 (00:14 +0200)
commitde135e3b9bdcb58358b872003fd1e98f51554912
treec16b0beeb84a6835ff0ebce5d1be1a4d789e8a25
parent9d91e53027e0a0c64f36a7eb5812dbe70c6dfaa7
parent965a8ba2c60eb04e2f65a4ace215113ac61f7c98
resolve merge conflicts
files/css/files.css
files/js/fileactions.js
files/js/filelist.js
files/js/files.js
files/templates/index.php