LucasGGamerM 531ce568c0 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/drawable/ic_fluent_bot_20_filled.xml
#	mastodon/src/main/res/layout/display_item_header.xml

2023-09-04 07:42:25 -03:00

..

assets

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

java

Merge remote-tracking branch 'megalodon_main/main'

2023-09-04 07:42:25 -03:00

res

Merge remote-tracking branch 'megalodon_main/main'

2023-09-04 07:42:25 -03:00

AndroidManifest.xml

build: add use camera feature flag to manifest

2023-08-20 11:54:16 -03:00

ic_launcher-playstore.png

Updating launcher icon

2023-02-16 11:37:07 -03:00