Gah, too many branch conflicts.
This commit is contained in:
parent
22cc194ed8
commit
bd85e95398
@ -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>`_)
|
||||||
|
Loading…
Reference in New Issue
Block a user