Merge branch 'master' into filecache_mtime (d7beac6d) · Commits · github / nextcloud / server

Commit d7beac6d authored Mar 08, 2013 by

Michael Gapczynski

Conflicts:
	lib/files/view.php
	lib/util.php
	tests/lib/files/cache/cache.php

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment