]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fix-7307
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 5 Mar 2014 23:15:08 +0000 (00:15 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 5 Mar 2014 23:15:08 +0000 (00:15 +0100)
commit32b29c9d735ae235641a7ea3869c14d7eb69cb4f
tree63e4e269bd33b0688965c9b3b1059466a8f502b8
parent6de370b64cb8f7fcd9d3bd090b8d801d91d2fcca
parent1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a
Merge branch 'master' into fix-7307

Conflicts:
core/js/router.js
settings/js/admin.js
apps/files/js/filelist.js
apps/files/js/files.js
lib/base.php
settings/js/admin.js
settings/routes.php