]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into remove_unused_vars
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 27 May 2013 16:09:35 +0000 (18:09 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 27 May 2013 16:09:35 +0000 (18:09 +0200)
commit2c3c60c1af1d789856760b79def8439f9fac6e96
treef820dd2dbe6d23b265eca1c07c3c9f0604cf42ce
parentc81e34ef899617d4c0280bd3b19d5ef7da31d158
parent4c05259ccfbb7e2f0083794172eaa7c06f4b2592
Merge branch 'master' into remove_unused_vars

Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/crypt.php