]> source.dussan.org Git - nextcloud-server.git/commitdiff
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)
1  2 
inc/lib_base.php

Simple merge