]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-998-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Sat, 19 Jan 2013 14:58:15 +0000 (15:58 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Sat, 19 Jan 2013 14:58:15 +0000 (15:58 +0100)
commitb8318e6df4ad8f2dcf466fa6b4d9c994c8943002
tree106c02fa35fbc0395252e49547f4b4cfd4433485
parent1dd70ac506982d230d18059ba3626ef2a92664fd
parent53b95cb8fd303e2daa392af23d338f7c9a85f6f4
Merge branch 'master' into fixing-998-master

Conflicts:
apps/files/js/files.js
apps/files/js/files.js