]> source.dussan.org Git - nextcloud-server.git/commit
merge conflicts ...
authorGeorg Ehrke <developer@georgehrke.com>
Wed, 10 Jul 2013 10:41:53 +0000 (12:41 +0200)
committerGeorg Ehrke <developer@georgehrke.com>
Wed, 10 Jul 2013 10:41:53 +0000 (12:41 +0200)
commita357e5b284ed5b752864e4570cb179f3f2d88229
treee811ea2288b5dfa069908f25f696f795a268cb53
parent832779804d36d27c47325d1dcce09e566c8cee60
parent5387e5c354440b264040816ea7fcaf6783a2ebdc
merge conflicts ...
apps/files/css/files.css
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/index.php
apps/files/templates/part.list.php
apps/files_trashbin/lib/trash.php
apps/files_trashbin/templates/part.list.php
config/config.sample.php
lib/base.php
lib/helper.php