]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into remove_unused_vars
authorFlorin Peter <github@florin-peter.de>
Tue, 28 May 2013 09:00:49 +0000 (11:00 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 28 May 2013 09:00:49 +0000 (11:00 +0200)
commit09b54ccb2b01c558b1d9ccad1e335492d97b4fe1
tree5962c534191376de8457e7d1a345e52210794d26
parent3a76c22372654bacb5c33a927779be06baca616e
parent086c33ef57ddddcad84e9cb21c9e24b5a4c43a5d
Merge branch 'master' into remove_unused_vars

Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php