diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-01-15 20:09:24 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-01-15 20:09:24 -0600 |
commit | 72c7bedaab6958b4fb3c53ae7c2d5e233181933c (patch) | |
tree | 4919b09f9c929fd14b54b5874152c1fa87bc1914 /shared/src/androidTest/kotlin/mx/trackermap/TrackerMap | |
parent | d2ab18cc01d2717bf46a378406ed1402381b3a40 (diff) | |
parent | 6aa78c8ddbcdeaace0f4596e7c717dafef036f03 (diff) | |
download | etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.tar.gz etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.tar.bz2 etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.zip |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/res/layout/user_information_activity.xml
Diffstat (limited to 'shared/src/androidTest/kotlin/mx/trackermap/TrackerMap')
0 files changed, 0 insertions, 0 deletions