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

merge conflict fixed, settings-personal.php is no longer needed 

Conflicts:
	apps/files_versions/templates/settings-personal.php
parents b69328e1 d276d21c
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