Balazs Toldi 8cf911685a Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java		2024-01-06 21:53:14 +01:00
..
src	Merge remote-tracking branch 'origin/master'	2024-01-06 21:53:14 +01:00
build.gradle	Merge changes from Infinity	2023-10-27 15:10:00 +02:00
proguard-rules.pro	Reproducible build fix	2023-10-26 08:05:23 +02:00