Commit Graph

9 Commits

Author SHA1 Message Date
Michael Gapczynski e202c29926 Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-07-10 17:26:36 -04:00
Michael Gapczynski 1b8e59a0ef Directory links in navigation shouldn't have a trailing '/' 2011-07-10 16:00:08 -04:00
Michael Gapczynski 05389827fd Merge branch 'master' into sharing
Conflicts:
	.gitignore
	lib/base.php
2011-07-04 16:36:30 -04:00
Jakob Sack e8e483d079 L10N is here ;-) 2011-06-19 18:53:02 +02:00
Michael Gapczynski 8603b0973f Initial setup of sharing app 2011-06-11 16:14:24 -04:00
Robin Appelman 1f514a1afa add kdevelop project files to .gitignore 2011-04-18 10:51:38 +02:00
Martin T. H. Sandsmark 64d4d57615 fix permissions, start to implement private data api 2010-07-16 11:36:03 +02:00
Robin Appelman a73fbc5e32 Merge commit 'refs/merge-requests/27' of git://gitorious.org/owncloud/owncloud into merge
Conflicts:
	inc/HTTP/WebDAV/Server/Filesystem.php
	inc/lib_config.php
	inc/lib_log.php
	inc/lib_user.php
	inc/templates/adminform.php
2010-07-05 12:17:31 +02:00
Thomas Zander cec33f19a4 Add a gitignore file for project 2010-05-22 23:49:32 +02:00