Skip to content

Commit

Permalink
Merge branch 'master' of github.com:pear/HTTP_WebDAV_Client
Browse files Browse the repository at this point in the history
Conflicts:
	package.xml
  • Loading branch information
CloCkWeRX committed Dec 11, 2011
2 parents 7bba3c3 + 1260b39 commit 421b833
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.xml
Expand Up @@ -12,7 +12,7 @@
<active>yes</active>
</lead>
<date>2011-12-11</date>
<time>22:38:23</time>
<time>22:35:56</time>
<version>
<release>1.0.2</release>
<api>1.0.0</api>
Expand Down

0 comments on commit 421b833

Please sign in to comment.