Merge branch 'devel' into messages

[diaspy.git] / diaspy / __init__.py

diff --git a/diaspy/__init__.py b/diaspy/__init__.py
index 172431a92f052ce29cd3f0bad715b738bb08577c..aabd59fdd562aa18613cc19ca97e1a8335e6e466 100644 (file)
--- a/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@ -1,6 +1,11 @@
+import diaspy.connection as connection
 import diaspy.models as models
-import diaspy.conversations as conversations
 import diaspy.streams as streams
-import diaspy.client as client
+import diaspy.conversations as messages
+import diaspy.conversations as conversations
 import diaspy.people as people
 import diaspy.notifications as notifications
+import diaspy.settings as settings
+
+
+__version__ = '0.4.1'