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

Merge branch 'master' into files_encryption 

Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
parents 9d324db0 afdad5c7
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