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

Merge branch 'master' into update-expire-function 

Conflicts:
	apps/files_trashbin/appinfo/version
	apps/files_trashbin/lib/trash.php
parents 632ca9f0 a37577e0
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