Commit Graph

2 Commits

Author SHA1 Message Date
Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
	lib/base.php
	lib/filestorage.php
2011-07-29 20:42:24 +02:00
Jakob Sack 924100dd8c One class per File 2011-07-27 19:52:24 +02:00