JC Brand 32593b755f Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master ... Conflicts: locale/locales.js Conflicts: index.html Add Russian translation by bkocherov (actually made against master branch)		2013-10-03 09:10:24 +02:00
..
converse.json	Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master	2013-10-03 09:10:24 +02:00
converse.po	Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master	2013-10-03 09:10:24 +02:00
ru.js	Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master	2013-10-03 09:10:24 +02:00