Vitor Pamplona 01818ff458 Merge remote-tracking branch 'origin/HEAD' into less_memory_test_branch ...

# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt

2023-03-13 14:09:17 -04:00

..

inspectionProfiles

extract most strings to strings.xml and add arabic language to strings.xml file

2023-03-01 07:50:01 +03:00

.gitignore

Base code for Amethyst

2023-01-11 13:31:20 -05:00

.name

extract most strings to strings.xml and add arabic language to strings.xml file

2023-03-01 07:50:01 +03:00

kotlinc.xml

resolve conflicts

2023-03-01 10:10:27 +03:00

misc.xml

Remove .idea files

2023-03-13 21:42:09 +08:00