diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-02 20:03:20 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-02 20:03:20 -0600 |
| commit | 287d0b62126b36ed4b268c99957143924ea295e6 (patch) | |
| tree | dfdea6c4ad576148bee44df0c566fb1f29380c3f /app/src/main/java/org/traccar/manager/MainActivity.kt | |
| parent | a38ac4af6dfd9123670123f695048add7be53eee (diff) | |
| parent | e8247f785fcacbebff9801464de025b0e16b52b3 (diff) | |
| download | etbsa-traccar-manager-android-287d0b62126b36ed4b268c99957143924ea295e6.tar.gz etbsa-traccar-manager-android-287d0b62126b36ed4b268c99957143924ea295e6.tar.bz2 etbsa-traccar-manager-android-287d0b62126b36ed4b268c99957143924ea295e6.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# build.gradle
Diffstat (limited to 'app/src/main/java/org/traccar/manager/MainActivity.kt')
0 files changed, 0 insertions, 0 deletions