]> source.dussan.org Git - nextcloud-server.git/commit
Merge remote-tracking branch 'core/master' into files_encryption
authorFlorin Peter <github@florin-peter.de>
Fri, 26 Apr 2013 15:39:13 +0000 (17:39 +0200)
committerFlorin Peter <github@florin-peter.de>
Fri, 26 Apr 2013 15:39:13 +0000 (17:39 +0200)
commit0ce54f092a552c3b082d9cafcd3c301d9bb802d1
tree8f42caf0281a0883a2e8f01c83238ce3f133bd52
parentd017bbb065245212e8aa4091f4bee0a4e8ea9055
parente6f84397aa87b8e50538197ddab44e5cd6380a90
Merge remote-tracking branch 'core/master' into files_encryption