NicKoehler bcfb649815 Fix conflicts

bcfb649815 · 2023-03-08 16:57:51 +01:00

History

..

common

Fix conflicts

2023-03-08 16:57:51 +01:00

desktop

better prompt

2023-03-08 15:57:33 +08:00

mobile

change "temporary password" to "one-time password"

2023-03-06 11:25:49 +08:00

models

Merge pull request #3544 from Heap-Hop/master

2023-03-08 10:54:52 +08:00

utils

Merge pull request #3196 from 21pages/relay_id

2023-02-16 12:50:40 +08:00

common.dart

better install prompt

2023-03-08 12:41:10 +08:00

consts.dart

fix mobile server event stream

2023-03-07 11:08:41 +09:00

main.dart

Merge branch 'master' into modern-dialog

2023-03-01 18:00:56 +01:00