xmpp.chapril.org-conversejs/docs/html
JC Brand 57fc8b9832 Merge branch 'master' into otr
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
2013-08-16 11:28:34 +02:00
..
_sources Regenerated docs 2013-08-16 11:27:29 +02:00
_static Add info on facebook integration 2013-08-13 11:19:40 +02:00
static Tweak docs css 2013-08-09 09:25:30 +02:00
.buildinfo Regenerated docs 2013-08-16 11:27:29 +02:00
genindex.html Regenerated docs 2013-08-16 11:27:29 +02:00
index.html Regenerated docs 2013-08-16 11:27:29 +02:00
objects.inv Regenerated docs 2013-08-16 11:27:29 +02:00
search.html Regenerated docs 2013-08-16 11:27:29 +02:00
searchindex.js Merge branch 'master' into otr 2013-08-16 11:28:34 +02:00