Skip to content
Commit 4dea6a62 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'master' into trashbin_encryption 

Conflicts:
	apps/files_trashbin/index.php
	apps/files_trashbin/lib/trash.php
parents 6aed7abf 9ee5069f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment