JC Brand d402ed8e8e Merge branch 'master' into otr ... Conflicts: locale/af/LC_MESSAGES/converse.po locale/converse.pot		2013-09-12 20:57:51 +02:00
..
converse.json	Decided to add the JSON files as well	2013-06-02 19:51:04 +02:00
converse.po	Merge branch 'master' into otr	2013-09-12 20:57:51 +02:00
de.js	Bugfix in translation files. Make sure Jed is defined.	2013-07-28 23:12:21 +02:00