Commit Graph

7 Commits

Author SHA1 Message Date
SpiritCroc ad8e9380b6 [TMP] Automatic upstream merge preparation
Change-Id: Ib8637486c2a7e77402e356605603e6577ecd88e6
2021-04-15 12:29:55 +02:00
SpiritCroc 5749e31508 Automatic upstream merge postprocessing
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
2021-04-14 14:02:43 +02:00
SpiritCroc 79daede4f5 [TMP] Automatic upstream merge preparation
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
2021-04-12 15:58:23 +02:00
SpiritCroc 235cfa48ee Automatic upstream merge postprocessing
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
2021-04-09 11:57:22 +02:00
SpiritCroc 5bfc106a33 [TMP] Automatic upstream merge preparation
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
2021-04-09 11:55:41 +02:00
SpiritCroc bfb7fe5938 Automatic upstream merge postprocessing 2021-03-14 10:59:10 +01:00
Matthew Hodgson aaeb9a0fd7 rename zh as per https://github.com/vector-im/element-android/issues/2752 2021-03-05 13:56:43 +00:00