xmpp.chapril.org-conversejs/locale/de
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
..
LC_MESSAGES Merge branch 'master' into otr 2013-09-12 20:57:51 +02:00