Chemaclass
|
f1b6927bb3
|
Merge branch 'main' into add-ktlint
Conflicts:
app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
app/src/main/java/com/vitorpamplona/amethyst/service/model/ReactionEvent.kt
app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt
app/src/main/java/com/vitorpamplona/amethyst/service/model/RepostEvent.kt
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
app/src/test/java/com/vitorpamplona/amethyst/NIP19ParserTest.kt
|
2023-03-07 20:42:38 +01:00 |