xmpp.chapril.org-conversejs/docs/doctrees
JC Brand 5f97f7ea28 Merge branch 'master' into gh-pages
Conflicts:
	build.js
	converse.min.css
	converse.min.js
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html
2013-07-30 23:40:59 +02:00
..
environment.pickle Merge branch 'master' into gh-pages 2013-07-30 23:40:59 +02:00
index.doctree 'build' grunt task was renamed to 'fetch'. Updated docs 2013-07-30 21:43:49 +02:00