diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-09 11:43:06 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-09 11:43:06 -0700 |
| commit | daa73a3f3c793014c653a3d08c5f8af5600170da (patch) | |
| tree | 10d9478401e6ff0733e682a6785427131ddf768a /docs/features.rst | |
| parent | 0b51afe87abf882fd74d18fe231458e33c949dd5 (diff) | |
| parent | 6997261c6b3479260465a6c829a21152f9019b4d (diff) | |
| download | slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.tar.gz slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.tar.bz2 slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.tar.xz slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/features.rst')
0 files changed, 0 insertions, 0 deletions