pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'docs' into develop

Browse source 
Conflicts:
	docs/index.rst
This commit is contained in:
Lance Stout 2012-01-18 15:36:18 -08:00
commit bb3080e829
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/index.rst
View file

@ -13,7 +13,7 @@ SleekXMPP
``develop`` branch. ``develop`` branch.
**Latest Stable Release** **Latest Stable Release**
- `1.0 RC3 <http://github.com/fritzy/SleekXMPP/zipball/1.0-RC3>`_ - `1.0 <http://github.com/fritzy/SleekXMPP/zipball/1.0>`_
**Develop Releases** **Develop Releases**
- `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_ - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_
@ -241,10 +241,6 @@ realtime web and XMPP applications.
- `contact@andyet.net <mailto:contact@andyet.net>`_ - `contact@andyet.net <mailto:contact@andyet.net>`_
- `XMPP Consulting <http://xmppconsulting.com>`_ - `XMPP Consulting <http://xmppconsulting.com>`_
**Co-Author:** Lance Stout
`lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,
`@lancestout <http://twitter.com/lancestout>`_
**Contributors:** **Contributors:**
- Brian Beggs (`macdiesel <http://github.com/macdiesel>`_) - Brian Beggs (`macdiesel <http://github.com/macdiesel>`_)
- Dann Martens (`dannmartens <http://github.com/dannmartens>`_) - Dann Martens (`dannmartens <http://github.com/dannmartens>`_)