]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into from_live_to_on
authorThomas Mueller <thomas.mueller@tmit.eu>
Thu, 31 Jan 2013 22:34:12 +0000 (23:34 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Thu, 31 Jan 2013 22:34:12 +0000 (23:34 +0100)
commitb1da1db0eb5d738d5d5e5379796c048614d2ba00
treea0ad3610338ffc5c911554d2915ed77194957144
parentde00111c1f20b46814971e1e0afac37fcb5c2886
parent317261d6dfa2b95234628c6e6649bcb94999552a
Merge branch 'master' into from_live_to_on

Conflicts:
apps/files_external/js/google.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js