summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVitor Mattos <vitor@php.rio>2022-01-19 07:56:01 -0300
committerVitor Mattos <vitor@php.rio>2022-01-21 08:39:41 -0300
commitab630f2cabbd15dbbf15cad65a4e4cf0cb230665 (patch)
treeca3167d832e9f3c9d42b8af12a4a8c641c82076f /tests
parentb9f74584a1e808019235d349fbae3f1fd1bdd711 (diff)
downloadnextcloud-server-ab630f2cabbd15dbbf15cad65a4e4cf0cb230665.tar.gz
nextcloud-server-ab630f2cabbd15dbbf15cad65a4e4cf0cb230665.zip
Fix conflict
Signed-off-by: Vitor Mattos <vitor@php.rio>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions