mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-07-31 00:29:22 +00:00
Resolved conflicts in values/strings.xml and values-fr/strings.xml by concatenating both blocks (no duplicate keys). |
||
|---|---|---|
| .. | ||
| kotlin/com/nuvio/app | ||
| res/xml | ||
| AndroidManifest.xml | ||