Conny Duck b08be1e1b0 Merge branch 'develop' into min_api_24 ... # Conflicts: # app/lint-baseline.xml		2023-07-05 20:46:20 +02:00
..
schemas/com.keylesspalace.tusky.db.AppDatabase	Save the a copy of the notification marker ID locally (#3672)	2023-05-18 23:23:42 +02:00
src	Merge branch 'develop' into min_api_24	2023-07-05 20:46:20 +02:00
build.gradle	Merge branch 'develop' into min_api_24	2023-07-05 20:46:20 +02:00
getGitSha.gradle	Previous attempt to fix git sha on non-git build broke git build. (#3322)	2023-02-16 20:20:52 +01:00
lint-baseline.xml	Merge branch 'develop' into min_api_24	2023-07-05 20:46:20 +02:00
lint.xml	Ignore LogConditional issues (#3615)	2023-05-04 14:50:21 +02:00
proguard-rules.pro	Remove shrinker rules for okhttp (#3560)	2023-04-24 12:08:03 +02:00