LucasGGamerM 38df70cd9e Merge remote-tracking branch 'refs/remotes/Jacocococo/quote-display-fixes' ... # Conflicts: # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java		2024-07-04 20:22:10 -03:00
..
src	Merge remote-tracking branch 'refs/remotes/Jacocococo/quote-display-fixes'	2024-07-04 20:22:10 -03:00
.editorconfig	Merge upstream redesign (#714)	2023-07-16 18:01:42 +02:00
.gitignore	…
build.gradle	build: add name suffixes for F-Droid and GitHub versions	2024-05-18 13:28:30 -03:00
proguard-rules.pro	chore(merging-upstream): bunch of conflicts to solve	2024-02-14 21:08:16 -03:00