diff options
author | root <root@v22013111044215586.yourvserver.net> | 2014-06-29 18:30:59 +0200 |
---|---|---|
committer | root <root@v22013111044215586.yourvserver.net> | 2014-06-29 18:30:59 +0200 |
commit | 5df50c4a0bf80f3697c7088c9c4a3815206fe97d (patch) | |
tree | ad3f2b4df700dae971683265c9a83d5bbee0eb31 /vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php | |
parent | 79dc4b83701f73bdece2b4d78a73698fbbc538c6 (diff) | |
parent | 628f1218049715c8acf953dbda8f902b3902cc2f (diff) | |
download | volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.tar.gz volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.tar.bz2 volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php')
-rw-r--r-- | vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php index b15ca37cc..cbb8fcf1a 100644 --- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php +++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php @@ -10,7 +10,7 @@ namespace Sabre\DAV\Exception; * * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/). * @author Evert Pot (http://evertpot.com/) - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License + * @license http://sabre.io/license/ Modified BSD License */ class Conflict extends \Sabre\DAV\Exception { |