Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	app/src/main/java/com/example/pap_findu/EditProfileActivity.java
#	app/src/main/java/com/example/pap_findu/MainActivity.java
#	app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
#	app/src/main/res/layout/fragment_map.xml

...

This commit is contained in:

230408

2026-04-23 10:42:53 +01:00

parent 9441cf992d 86da99ee13

commit 17a7cd7aae

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available