diff options
author | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:34:49 -0800 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:34:49 -0800 |
commit | bd85e9539850f691f39994ade126ccd73371f61d (patch) | |
tree | 8d2199f4b52d3a842a532cd5659590ca5a75ced4 /docs | |
parent | 22cc194ed878ac00715951605dcdee51eb313f1b (diff) | |
download | slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.gz slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.bz2 slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.xz slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.zip |
Gah, too many branch conflicts.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/index.rst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/index.rst b/docs/index.rst index 9e3fc064..6f6d8913 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -241,10 +241,6 @@ realtime web and XMPP applications. - `contact@andyet.net <mailto:contact@andyet.net>`_ - `XMPP Consulting <http://xmppconsulting.com>`_ -**Co-Author:** Lance Stout - `lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_, - `@lancestout <http://twitter.com/lancestout>`_ - **Contributors:** - Brian Beggs (`macdiesel <http://github.com/macdiesel>`_) - Dann Martens (`dannmartens <http://github.com/dannmartens>`_) |