Merge branch 'master' into files_encryption (ff6f52d5) · Commits · github / nextcloud / server

Commit ff6f52d5 authored Mar 28, 2013 by

Sam Tuke

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.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