AbdulajevAr51780/mMDT5_PR_MSY1_Gruppe1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: AbdulajevAr51780:c37a99723f78c2a26f1af1e3d8c51a4e401a7276
Branches Tags
AbdulajevAr51780:master
...
compare: AbdulajevAr51780:1d2485d59e7e902c79ede2ff834b864cdef6cfd1
Branches Tags
AbdulajevAr51780:master

2 Commits
c37a99723f ... 1d2485d59e

Author SHA1 Message Date
Raz492
1d2485d59e Merge remote-tracking branch 'origin/master' 2021-06-20 21:24:34 +02:00
Raz492
eba661a070 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/de/edotzlaff/schockwelle/EarthquakeMapsActivity.java
#	app/src/main/java/de/edotzlaff/schockwelle/SensorMapsActivity.java
#	app/src/main/res/layout/activity_earthquake_maps.xml
 2021-06-20 21:22:55 +02:00
Show Stats Expand all files Collapse all files

Diff Content Not Available