Konrad Pozniak 106585f4fe Merge remote-tracking branch 'weblate/develop' into develop ... # Conflicts: # app/src/main/res/values-fr/strings.xml		2022-03-28 11:36:50 +02:00
..
schemas/com.keylesspalace.tusky.db.AppDatabase	Instance configuration: the easy parts (#2341)	2022-03-01 19:43:36 +01:00
src	Merge remote-tracking branch 'weblate/develop' into develop	2022-03-28 11:36:50 +02:00
.gitignore
build.gradle	update glide animation plugin to 2.20.0 (#2401)	2022-03-23 19:14:41 +01:00
proguard-rules.pro	fix crash in drafts caused by minification of DraftAttachment (#2337)	2022-02-14 19:20:15 +01:00