]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'merge'
authorRobin Appelman <icewind1991@gmail.com>
Thu, 8 Jul 2010 18:31:54 +0000 (20:31 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Thu, 8 Jul 2010 18:31:54 +0000 (20:31 +0200)
commit68cc904bc1da14647ff8ee15a770e8a4107fa2cd
tree062415973724f1fe2bcf41da13ad9f6fcc4d1c14
parent11d515ef4ec2ad1211b6873c04ce8acb6ca3bcaa
parent32e58512552166e14a94c6ff690f0037c12b92ec
Merge branch 'merge'
inc/lib_base.php