Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rebase against Element Android v1.6.30 #1147
base: develop
Are you sure you want to change the base?
Rebase against Element Android v1.6.30 #1147
Changes from all commits
6959f98
91bfd7a
adcafd5
498e867
e01e24e
b341a1a
00b0164
cb21703
9057a80
acf56cf
21f5adf
fb10bd5
3ab588f
0baf670
91d9668
76616b1
ac268ca
4558e4b
d962f4a
bcd0f64
743bb46
f93a575
940458f
9274b50
1a42519
9ed9a04
295f4c7
d69969d
e2d1b03
5feee72
8caa5c9
b9b4f46
5be3b00
36eb12d
af072fa
eaec6dd
3293785
9d75e4a
797a4f9
9585262
6a8e978
5908cd5
15c86f3
637a227
fc68f1c
355621b
8056285
b303da2
146c510
14a52d4
9dcb7c8
51c20b4
f726d16
2ed0b4f
4762b80
f431daa
4aab1ad
da94bb8
7f46d96
036d6c3
0f14a28
04a49e9
0ed68c5
9efb692
f7195a8
19de60d
76898f0
e89bec4
1ac5090
ac01523
af2cefe
cfedc00
9a4602b
a568152
9ca1ffd
c947f90
52d06bd
5ef8900
115b15d
b6c5626
08decf4
c24014e
5c333ae
ba9d78e
72ed4e7
74ed438
7ce6c3c
e30a377
82b8f57
1e330ce
dd98218
82d64be
b50132a
21e751e
77b4503
53387e6
aff6c01
dbc78db
bbb411e
6215189
5fed1a7
00e6cf1
d7f6b70
768c65d
50d4e56
c9aaf02
79f19fd
05be9d0
6902ba7
f8b2bc0
686ca05
11f6987
bbcd48b
d3b1e76
0f06dff
4b8f376
bbf8bf3
350fa20
6cbe0e0
598773a
78dbc68
bb46dcb
27b4a08
3df42fa
5dd5854
90aed72
6d7e744
b9ba039
ac94bff
e0cbd61
066545a
6e2a0cf
12adddb
2cfc230
5537bf8
36e8b7b
f189fa7
ab4291f
fbef34f
ebfac82
a608bff
7051c0c
ea170fc
93962d0
c1efaf2
d9cd23a
970ff7a
d5c7c91
dcafdab
ae494bd
1363be5
2c75844
591ec10
367fcfa
6b5a284
29715e4
8641c82
132ea23
4f9bdd8
de6b7c5
c8f86aa
8529813
9b59f69
0c4a229
91f4593
11704c4
770b598
a6665ec
3475f77
e4bc48e
331a61b
a4fdf92
8c18ece
08ceb76
ff3d5d6
d9fcc76
2a979d2
25bacc6
87daab7
e64fbfa
f39bdb5
f37b3f7
00c1aaa
abe9ee4
f3dc242
83f3a72
86c4249
35ca771
aa26556
e8f9566
a61bbc0
f186476
edfd446
6dddaf2
2217631
9dfc1f1
324ea95
505168f
0c3686c
a0d1b2d
c3fa399
38a9fbd
037958f
9196002
04b19ba
deacb58
ae696a5
3b7098f
b6f863f
3330029
05a7194
73c1dc1
fefdb78
d2c77a3
b9b403d
5dfbc3f
ded1fdd
0e4c39b
6278f59
e42075a
93d6f32
002f366
d97f69b
f26a0b6
624a07b
18c9473
5c3f221
6718ed8
069aa9d
fa8c4eb
6fc948d
36a74f4
de0c245
1fd27a5
d4e3d45
5893c70
1620981
cdb8e9d
af906ce
6ac7666
c5643ac
176f8e8
ed2b9a1
2c2f8bd
35f399a
a8b9634
febd9fe
73a0ec7
5a12b0b
dd40f32
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.