]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-998-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Fri, 18 Jan 2013 22:22:34 +0000 (23:22 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Fri, 18 Jan 2013 22:22:34 +0000 (23:22 +0100)
commitafb5de955e00490be5762247e817b20722091f37
tree035b826eacc5a21244c383075138731eaafeaebc
parent130c9cad030ca777e23ef70b76822553ea1c6411
parent31cc9aa80d4284e13dc95d2ef1428bed78c22d65
Merge branch 'master' into fixing-998-master

Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
apps/files/ajax/upload.php
apps/files/index.php
apps/files/js/files.js
core/css/styles.css
core/js/js.js
core/templates/layout.user.php
lib/helper.php
settings/js/users.js
settings/templates/users.php