diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:36:18 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:36:18 -0800 |
| commit | bb3080e829df126466c44cb2f89a0307e5c4146a (patch) | |
| tree | 6cacc94dcc612d570b5010f925eb209ca9eec1e8 | |
| parent | fd515d807c9af22b2df5cbe31825bf26aad596c1 (diff) | |
| parent | bd85e9539850f691f39994ade126ccd73371f61d (diff) | |
| download | slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.gz slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.bz2 slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.xz slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.zip | |
Merge branch 'docs' into develop
Conflicts:
docs/index.rst
| -rw-r--r-- | docs/index.rst | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docs/index.rst b/docs/index.rst index 8b2d4d3d..6f6d8913 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,7 @@ SleekXMPP ``develop`` branch. **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** - `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>`_ - `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>`_) |