Merge remote-tracking branch 'origin/my-bug-fix' into my-bug-fix · ankidroid/Anki-Android@b3a7a1f · GitHub

Commit

Merge remote-tracking branch 'origin/my-bug-fix' into my-bug-fix

Browse files

# Conflicts:
#	AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
#	AnkiDroid/src/main/java/com/ichi2/utils/DisplayUtils.kt

Loading branch information

jainv4156 committed Jan 24, 2025

2 parents 8718677 + 126bb42 commit b3a7a1f