]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-998-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 21:28:21 +0000 (22:28 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 21:28:21 +0000 (22:28 +0100)
commit07b3b23a39d3592602efea3ab6448178fb1b166a
treeb02c933bc673b3e0e41e096d464cc9c27ad32167
parent7ebfcab49bf0ceac7f32a66f393ebdadc5d64a77
parent08d7b8ce309baebfc243727c215b63e732bf874e
Merge branch 'master' into fixing-998-master

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