]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fix_minor_files_annoyances
authorThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 21:46:40 +0000 (22:46 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 21:46:40 +0000 (22:46 +0100)
commit9671ace32e57ce6b176a50dc346baf3b3b7eb14e
treebf3b4afd8de851d108909fc5a9ad198c13d93c8a
parent9cd7bb2c8d7b7207a3c67e09158641b0c33e631d
parent08d7b8ce309baebfc243727c215b63e732bf874e
Merge branch 'master' into fix_minor_files_annoyances

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