Merge branch '2.0RC'

2016-12-23 10:09:46 +01:00
parent 2e5a993f88 ef39c1e94b
commit 3b9b03cf86
506 changed files with 73281 additions and 37727 deletions
--- a/util/zotsh/README.txt
+++ b/util/zotsh/README.txt
@@ -8,6 +8,8 @@ Install
 ZotSH requires 'requests'(1).
 Please refer to requests docs on how to install it (2)

+The initially connected server must have the twitter_api plugin installed
+
 Extract somewere and launch zotsh.py


@@ -106,4 +108,4 @@ Links

 _0 : https://github.com/amnong/easywebdav
 _1 : http://docs.python-requests.org/en/latest/
-_2 : http://docs.python-requests.org/en/latest/user/install/
+_2 : http://docs.python-requests.org/en/latest/user/install/
--- a/util/zotsh/easywebdav/init.pyc
+++ b/util/zotsh/easywebdav/init.pyc
--- a/util/zotsh/easywebdav/version.pyc
+++ b/util/zotsh/easywebdav/version.pyc
--- a/util/zotsh/easywebdav/client.pyc
+++ b/util/zotsh/easywebdav/client.pyc