summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-09 01:23:35 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-09 01:23:35 +0100
commitad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f (patch)
tree3f2bbf1be7f753f1c7495f0a60833f469e7f10a7 /README
parent7fadb35fe2e7932a0a4aa6a8184ab6b186669edc (diff)
parent03999f1ef08036b7ea25e2239cf7b6bcdb4d76cc (diff)
downloadpoezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.tar.gz
poezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.tar.bz2
poezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.tar.xz
poezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.zip
Merge branch 'plugins'
Conflicts: README src/core.py src/tabs.py
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 2 insertions, 0 deletions
diff --git a/README b/README
index 9897e687..752693d3 100644
--- a/README
+++ b/README
@@ -143,6 +143,7 @@ we merge it to “master” as well, of course).
Thanks
=======================
= People =
+ - Todd Eisenberger (todd@teisen.be) - Plugin system
- Link Mauve - Code, testing
- Gaëtan Ribémont (http://www.bonbref.com) - Logo design
- Ovart - Testing
@@ -153,3 +154,4 @@ we merge it to “master” as well, of course).
on the jabber chatroom doing bug reports and/or feature requests.
= Project =
Gajim - send_vcard method and common.py
+