diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 23:21:50 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 23:21:50 +0200 |
| commit | 0918fc7d9156f3846a19b673db5b01422a59c506 (patch) | |
| tree | 131188252fd42c4f3c9673975adafa24783c632f /3rdparty/Sabre/DAV/Exception/Locked.php | |
| parent | 77cefdedb86de65e69f470c8b6a1b03bb001966e (diff) | |
| parent | 74e540271122222f650bbbfaeaac310b0e592674 (diff) | |
| download | nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.tar.gz nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.zip | |
fix merge conflicts
Diffstat (limited to '3rdparty/Sabre/DAV/Exception/Locked.php')
0 files changed, 0 insertions, 0 deletions