JC Brand fad6b5368d Fix incorrect merge (from master into converse-omemo branch)		2018-07-01 12:04:45 +02:00
..
converse-no-dependencies.js	Updated css and fix some niggles in the Makefile	2018-06-14 10:22:16 +02:00
converse.js	Fix incorrect merge (from master into converse-omemo branch)	2018-07-01 12:04:45 +02:00