]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'stable5' into files_encryption_stable5
authorFlorin Peter <github@florin-peter.de>
Fri, 24 May 2013 17:40:23 +0000 (19:40 +0200)
committerFlorin Peter <github@florin-peter.de>
Fri, 24 May 2013 17:40:23 +0000 (19:40 +0200)
commite7734d0c46f153f12d08cbc68978fe37db6720f4
tree9ce9c6170199cadcd295dfd8b90e8e5bbd5e31ed
parent890b7702ef28fe0cb82eeebc3490351b2a3accf0
parent1a638cd3a8943c4073dff2f6490b620b4b4fe577
Merge branch 'stable5' into files_encryption_stable5
lib/util.php