mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-08-04 10:36:56 +00:00
Resolved conflicts in values/strings.xml and values-fr/strings.xml by concatenating both blocks (no duplicate keys). |
||
|---|---|---|
| .. | ||
| strings.xml | ||