diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-20 18:15:54 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-20 18:15:54 -0700 |
| commit | 5492e9028df8d1d2a064693b4dd06bd92cc9f60a (patch) | |
| tree | 9d3a2b7da94454e994fa76aec6c2e0699a0b6453 /docs/features.rst | |
| parent | 060c9ab6794cbe6c62c312b1f42bd3767ff66b80 (diff) | |
| parent | 474390fa00a4c2ddf63976bdaf95468248ddd12b (diff) | |
| download | slixmpp-5492e9028df8d1d2a064693b4dd06bd92cc9f60a.tar.gz slixmpp-5492e9028df8d1d2a064693b4dd06bd92cc9f60a.tar.bz2 slixmpp-5492e9028df8d1d2a064693b4dd06bd92cc9f60a.tar.xz slixmpp-5492e9028df8d1d2a064693b4dd06bd92cc9f60a.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/features.rst')
0 files changed, 0 insertions, 0 deletions