Grishka db84317f7f Merge branch 'master' into donations ... # Conflicts: # mastodon/build.gradle		2024-07-03 01:30:43 +03:00
..
src	Merge branch 'master' into donations	2024-07-03 01:30:43 +03:00
.editorconfig	…
.gitignore	…
build.gradle	Merge branch 'master' into donations	2024-07-03 01:30:43 +03:00
ci_signing.gradle	…
proguard-rules.pro	Fix more things	2024-03-06 20:58:59 +03:00