From: Marek Marecki <marekjm@taistelu.com>
Date: Sat, 24 Aug 2013 13:25:25 +0000 (+0200)
Subject: Messages are conversations once again
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66e4433420797d5591d3199a496e0c462c546ccd;p=diaspy.git

Messages are conversations once again
---

diff --git a/diaspy/__init__.py b/diaspy/__init__.py
index 1a7d7c4..6e947cd 100644
--- a/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@ -1,7 +1,8 @@
 import diaspy.connection as connection
 import diaspy.models as models
 import diaspy.streams as streams
-import diaspy.messages as messages
+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
diff --git a/diaspy/messages.py b/diaspy/conversations.py
similarity index 100%
rename from diaspy/messages.py
rename to diaspy/conversations.py