xmpp.chapril.org-conversejs/docs/html
JC Brand ae96dc1e64 Merge branch 'master' into mockup
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
2013-08-15 18:01:26 +02:00
..
_sources Add info on facebook integration 2013-08-13 11:19:40 +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 Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
genindex.html Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
index.html Add info on facebook integration 2013-08-13 11:19:40 +02:00
objects.inv Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
search.html Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
searchindex.js Merge branch 'master' into mockup 2013-08-15 18:01:26 +02:00