Skip to content

Commit 42ab243

Browse files
committed
chore: Merge master into 4.72.0-master
Resolve master ↔ develop conflicts on the release branch: - Version files kept at develop (4.72.0). - app/views/ChangePasscodeView.tsx, app/views/ScreenLockedView.tsx kept develop's layout — master's older centering CSS would reintroduce the regression fixed by #7118. - yarn.lock kept develop's (axios is 0.30.3 on both).
2 parents 8b70425 + a5fea7f commit 42ab243

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,3 @@ class NotificationIntentHandler {
170170
}
171171
}
172172
}
173-

0 commit comments

Comments
 (0)