Merge branch 'master' into load-apps-proper-master (6ff96b34) · Commits · github / nextcloud / server

Commit 6ff96b34 authored Mar 21, 2014 by

Thomas Müller

Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.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