]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into remove_unused_vars
authorFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 07:21:00 +0000 (09:21 +0200)
committerFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 07:21:00 +0000 (09:21 +0200)
commitc398fc59ad870751cee73a2fbef8bc75233a7515
treef686bab6d58a62fefd231b8132b5efa0001ba0ec
parent09b54ccb2b01c558b1d9ccad1e335492d97b4fe1
parent7c0c6bd779cb73c4fdc9993f6dc78f9dd1138a88
Merge branch 'master' into remove_unused_vars

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