]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Mon, 7 May 2012 09:47:14 +0000 (11:47 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Mon, 7 May 2012 09:47:14 +0000 (11:47 +0200)
commit46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3
tree78896053233f385afbdc6006eade163626048bf6
parent7d2a68fc314bcefa69413d85e69ffd10dc34ddc5
parent3a184e2e1d7ae49d596e06b724ffc36382d02596
fix merge conflicts
apps/files/appinfo/remote.php