diff options
author | Lance Stout <lancestout@gmail.com> | 2012-09-25 02:45:48 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-09-25 02:45:48 -0700 |
commit | 73ce9a5eccb5fea6f9a6dd72410cdada2a43347f (patch) | |
tree | 8589f9f5e8c0730152779fc57c6a7d178a1cfb3b /docs/plugin_arch.rst | |
parent | d385b9e708e9e8904ed9a19ac01096c50d521eff (diff) | |
parent | 671f680bb39f366ad13bf937c7b611f667343314 (diff) | |
download | slixmpp-73ce9a5eccb5fea6f9a6dd72410cdada2a43347f.tar.gz slixmpp-73ce9a5eccb5fea6f9a6dd72410cdada2a43347f.tar.bz2 slixmpp-73ce9a5eccb5fea6f9a6dd72410cdada2a43347f.tar.xz slixmpp-73ce9a5eccb5fea6f9a6dd72410cdada2a43347f.zip |
Merge branch 'master' into develop
Diffstat (limited to 'docs/plugin_arch.rst')
0 files changed, 0 insertions, 0 deletions