Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master
Conflicts: locale/locales.js
Showing
locale/ru/LC_MESSAGES/ru.js
0 → 100644
Please register or sign in to comment
Conflicts: locale/locales.js