aboutsummaryrefslogtreecommitdiff
path: root/settings.gradle.kts
diff options
context:
space:
mode:
authorIsidro Henoch <imhenoch@protonmail.com>2022-01-03 13:55:58 -0600
committerIsidro Henoch <imhenoch@protonmail.com>2022-01-03 13:55:58 -0600
commit1c94fbca0faebea6d005a92a53e7885e3ddd7dc6 (patch)
tree5567d2c823e0d28627f67738d07b810a65a2a0eb /settings.gradle.kts
parent4196352a52eba7e9148cbab6e12d7bafb0f07d88 (diff)
parent84fd0a97d775b88ef03c3161bbe126032ace8238 (diff)
downloadetbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.tar.gz
etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.tar.bz2
etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.zip
Merge branch 'reports'
# Conflicts: # androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt # androidApp/src/main/res/values/strings.xml
Diffstat (limited to 'settings.gradle.kts')
0 files changed, 0 insertions, 0 deletions