]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind1991@gmail.com>
Mon, 5 Jul 2010 09:44:33 +0000 (11:44 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Mon, 5 Jul 2010 09:44:33 +0000 (11:44 +0200)
1  2 
inc/lib_base.php
inc/templates/adminform.php

Simple merge
Simple merge