diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:42:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:42:32 -0700 |
| commit | 4b7ec4a32ac15dfa35b3282793a8317cfd32837b (patch) | |
| tree | 626c0287a09b81ed5415de95f9adeb24ad42293a /docs/xeps.rst | |
| parent | a00eee1bbee83b2435b09be6c4175c3649fa797b (diff) | |
| parent | 2229ad8d8e51b73a7900b118dfab5d7b449f17ce (diff) | |
| download | slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.gz slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.bz2 slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.xz slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/xeps.rst')
0 files changed, 0 insertions, 0 deletions