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

apps/files_versions/ajax/expireAll.php

apps/files_versions/ajax/getVersions.php

apps/files_versions/ajax/rollbackVersion.php

apps/files_versions/history.php

apps/files_versions/js/settings-personal.js

apps/files_versions/lib/hooks.php

apps/files_versions/lib/versions.php

apps/files_versions/settings-personal.php

apps/files_versions/templates/settings-personal.php