alansley be400d8f4f Removed commented out merge conflict marker

2024-08-06 11:32:08 +10:00

..

androidTest

Initial squash merge for strings

2024-07-26 11:34:05 +10:00

huawei

Add huawei strings

2023-08-16 20:54:07 +09:30

main

Removed commented out merge conflict marker

2024-08-06 11:32:08 +10:00

play

Refactor to accept Huawei token from getToken() and/or onNewToken()

2023-08-09 10:08:42 +09:30

sharedTest/java/org/thoughtcrime/securesms

Merge dev (#1468)

2024-05-01 12:59:33 +10:00

test

Merge dev and cleanup

2024-08-06 11:30:50 +10:00

website/kotlin/org/thoughtcrime/securesms/notifications

Fix website flavor TokenFetcher

2023-08-17 14:02:22 +09:30