Commit 42ab243
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).1 file changed
Lines changed: 0 additions & 1 deletion
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
173 | | - | |
0 commit comments