diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-17 01:02:36 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-17 01:02:36 -0600 |
| commit | 70d21d0dab61fc2b30f64721279b27a2c8a01d7a (patch) | |
| tree | db5c7b3f53e020193dafbead813899b00573e782 /androidApp/src/main/res/menu | |
| parent | 70af8a0fffe32033230d8f7a4d23f098d4b742bb (diff) | |
| parent | 6858de4bf2ba110abc29078194135d971ce71aa5 (diff) | |
| download | etbsa-trackermap-mobile-70d21d0dab61fc2b30f64721279b27a2c8a01d7a.tar.gz etbsa-trackermap-mobile-70d21d0dab61fc2b30f64721279b27a2c8a01d7a.tar.bz2 etbsa-trackermap-mobile-70d21d0dab61fc2b30f64721279b27a2c8a01d7a.zip | |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
androidApp/src/main/res/values/map_layers.xml
Diffstat (limited to 'androidApp/src/main/res/menu')
0 files changed, 0 insertions, 0 deletions