aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-17 23:46:13 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-17 23:46:13 -0600
commit675eb2739105e53a8f5f0f602b3c2b2206d28623 (patch)
tree183b82c471e611d6de0390270e690e238265b149 /.gitignore
parent9ff880b37f3e44aa3edbd402c8c01aed5467e26a (diff)
parent9325b6e0de41e8446bb6ce66915fb0c9fe0de4f3 (diff)
downloadetbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.tar.gz
etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.tar.bz2
etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.zip
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
 Conflicts:  androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions