]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into remove_unused_vars
authorFlorin Peter <github@florin-peter.de>
Mon, 27 May 2013 15:26:35 +0000 (17:26 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 27 May 2013 15:26:35 +0000 (17:26 +0200)
commit690bf9b8c4a0d9b5b4d7cfed6926ae9c794f30c6
treea8eb1f49db7441aef7d91687d16b62792bbb2a98
parent710e9c2d14c8f25cfedf5cc04fa4ca0e12fc2f19
parentf8d1c32112c919bbdfc89a35d77ea84412800470
Merge branch 'master' into remove_unused_vars

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