diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-28 11:02:57 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-28 11:02:57 -0700 |
| commit | a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3 (patch) | |
| tree | 40d99fd4b547e4f81e2c9c2b29682c6bb7ac7a06 /sleekxmpp/plugins/xep_0280 | |
| parent | 73ce9a5eccb5fea6f9a6dd72410cdada2a43347f (diff) | |
| parent | ee9c4abd08db06fd6dc808d48c43cd6d57bd1aa1 (diff) | |
| download | slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.gz slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.bz2 slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.xz slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0280')
| -rw-r--r-- | sleekxmpp/plugins/xep_0280/__init__.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0280/carbons.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0280/__init__.py b/sleekxmpp/plugins/xep_0280/__init__.py index 8ed65346..929321af 100644 --- a/sleekxmpp/plugins/xep_0280/__init__.py +++ b/sleekxmpp/plugins/xep_0280/__init__.py @@ -1,6 +1,6 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout + Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout This file is part of SleekXMPP. See the file LICENSE for copying permissio diff --git a/sleekxmpp/plugins/xep_0280/carbons.py b/sleekxmpp/plugins/xep_0280/carbons.py index 7eec7acd..fe2cdbb2 100644 --- a/sleekxmpp/plugins/xep_0280/carbons.py +++ b/sleekxmpp/plugins/xep_0280/carbons.py @@ -1,6 +1,6 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout + Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout This file is part of SleekXMPP. See the file LICENSE for copying permissio |