summaryrefslogtreecommitdiff
path: root/docs/_static
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-10 14:15:55 -0700
committerLance Stout <lancestout@gmail.com>2012-08-10 14:15:55 -0700
commit962dfad2166574955c7be6d12c930991b0f29403 (patch)
tree6a4dd01bd7668bb133814d0e099fed38ef7d08d7 /docs/_static
parent14aa8311690f3a58ff4b7ad286bcccdd867789f7 (diff)
parentf7a710e55bf433a378dee4bd05f6ceb59f2e9e2d (diff)
downloadslixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.gz
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.bz2
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.xz
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/_static')
0 files changed, 0 insertions, 0 deletions