07b07115d6
Conflicts: src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
eu/siacs/conversations |
07b07115d6
Conflicts: src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
eu/siacs/conversations |