Merge branch 'master' into gh-pages
Conflicts: locale/hu/LC_MESSAGES/converse.po
Showing
No preview for this file type
No preview for this file type
This diff is collapsed.
This diff is collapsed.
locale/de/LC_MESSAGES/de.js
0 → 100644
This diff is collapsed.
locale/hu/LC_MESSAGES/hu.js
0 → 100644
This diff is collapsed.
Please register or sign in to comment