filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,039 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

147 Commits

Author SHA1 Message Date
SpiritCroc fc8be0c8c5 Automatic upstream merge postprocessing 
Change-Id: I76c44254c911cca11449d24928721ef0e01c5f3e
 2021-07-19 16:15:38 +02:00
SpiritCroc 2aa4d868e4 [TMP] Automatic upstream merge preparation 
Change-Id: Iaf09a78fbaad18a6581bfd5384239f471b007fdf
 2021-07-19 16:05:39 +02:00
SpiritCroc 0cb876485d Automatic upstream merge postprocessing 
Change-Id: Ie2b3c8142cf8fd3fe9a042b686c8f8ba57fac7dd
 2021-07-05 16:58:49 +02:00
SpiritCroc f8084dc2e2 [TMP] Automatic upstream merge preparation 
Change-Id: If4581aa8e4f43b4963a3ed44313f7dd1d00d7581
 2021-07-05 10:32:08 +02:00
SpiritCroc d1f51abbcd Automatic upstream merge postprocessing 
Change-Id: I8d5fd7af5b04c9e19e925fe37114ec72e152d559
 2021-06-24 10:19:45 +02:00
SpiritCroc fb2551fc90 [TMP] Automatic upstream merge preparation 
Change-Id: Ia98cb8dfb432d851e1e2c6bc63449b2341c7e5ac
 2021-06-20 09:04:09 +02:00
SpiritCroc c01142b813 Automatic upstream merge postprocessing 
Change-Id: I1c0d40ef25bef54205bb21ef0a9f03a12b427b83
 2021-06-02 17:49:37 +02:00
SpiritCroc 8b6e8ad3c5 [TMP] Automatic upstream merge preparation 
Change-Id: I12f25c8c45e1f120f1e05041fd281f02a3f6392d
 2021-06-02 17:04:48 +02:00
SpiritCroc 6693b398bb Automatic upstream merge postprocessing 
Change-Id: Iff3f2521a41455cfc94afc1b4e0ad961c0d64ce8
 2021-05-26 10:44:23 +02:00
SpiritCroc 6e60fd7328 [TMP] Automatic upstream merge preparation 
Change-Id: Ic0b3e2a1ac115db029101589e77e16cf4b38d314
 2021-05-26 08:48:20 +02:00
SpiritCroc 19605b0cdc Automatic upstream merge postprocessing 
Change-Id: Iad909d733876af3c770cd5bad26a971bd5b74dc2
 2021-05-12 16:01:49 +02:00
SpiritCroc 38b4da547e [TMP] Automatic upstream merge preparation 
Change-Id: I1f5c1f52159efe0485c11056da07d3e8b1aeacba
 2021-05-12 15:45:50 +02:00
SpiritCroc 3b94ea72d3 Automatic upstream merge postprocessing 
Change-Id: I18bd4c7615bc18926f0a5aafc0011d1b8d0f47eb
 2021-04-16 15:32:21 +02:00
SpiritCroc 7a7cad9bb6 [TMP] Automatic upstream merge preparation 
Change-Id: I74d0a4cf0fdddf3339958b21f0ceefceaec0fd47
 2021-04-16 15:29:14 +02:00
SpiritCroc 5757d1894c Automatic upstream merge postprocessing 
Change-Id: Ia39d86869d7d2a16e2408838d5a3c5b0f80f3711
 2021-04-15 12:30:02 +02:00
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
SpiritCroc 1aed52e291 [TMP] Automatic upstream merge preparation 2021-03-14 10:13:06 +01:00
SpiritCroc 1e1a974678 Automatic upstream merge postprocessing 
Change-Id: Ia57cedc2fce20341f97c4612adf9e46df93f7cf3
 2021-02-20 15:41:40 +01:00
SpiritCroc 7eb3b7e9cd [TMP] Automatic upstream merge preparation 
Change-Id: I813dbf150890acbef690dca516b2e8369aa860da
 2021-02-20 15:03:24 +01:00
SpiritCroc 02371a9604 Automatic upstream merge postprocessing 
Change-Id: I0a6c3834776a655427847e52bbe6b71928d3c2dc
 2021-02-10 11:25:32 +01:00
SpiritCroc b0a6e4cd28 [TMP] Automatic upstream merge preparation 
Change-Id: I978bc20a50c282cba36660444d754cd4a4a3f1fa
 2021-02-10 10:07:21 +01:00
SpiritCroc 8e32c041db Automatic upstream merge postprocessing 
Change-Id: Id3446b2b984430aa7f1fd6cba36410ee80a21c4c
 2021-02-04 17:10:24 +01:00
SpiritCroc ad4ba631b9 [TMP] Automatic upstream merge preparation 
Change-Id: I2ae1f63d762d0366be303ba08778a35673f5a3d3
 2021-02-04 17:00:40 +01:00
SpiritCroc c87627bb5e Automatic upstream merge postprocessing 
Change-Id: I0da2864255e9d91599bc42ffccf7c9d345f5edc1
 2021-01-16 11:21:50 +01:00
SpiritCroc f0e83813e9 [TMP] Automatic upstream merge preparation 
Change-Id: Iaa07f187ded58fa745830596edd27e324ca8339e
 2021-01-15 17:33:22 +01:00
SpiritCroc c775fa73ea Automatic upstream merge postprocessing 
Change-Id: I3093ec9e4f74fe91ef1894b130b3cd188e5670d5
 2020-12-22 09:24:46 +01:00
SpiritCroc d0936d2b25 [TMP] Automatic upstream merge preparation 
Change-Id: Ic52efb1677b303fc001ee2c63a912d2a3db63c45
 2020-12-22 09:18:49 +01:00
SpiritCroc b0d09313e7 Automatic upstream merge postprocessing 
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
 2020-12-15 15:55:57 +01:00
SpiritCroc 299902feed [TMP] Automatic upstream merge preparation 
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
 2020-12-15 15:00:31 +01:00
SpiritCroc 0469beab1c Automatic upstream merge postprocessing 
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
 2020-11-29 12:52:25 +01:00
SpiritCroc b283ba3b0a [TMP] Automatic upstream merge preparation 
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
 2020-11-29 12:32:30 +01:00
SpiritCroc c3f62cf80d Automatic upstream merge postprocessing 
Change-Id: Ib14a077c026657aff23ffbc42ade1e4524b0b8c2
 2020-11-05 13:16:02 +01:00
SpiritCroc fc33d50c61 [TMP] Automatic upstream merge preparation 
Change-Id: Idd7894614eec671dcce0eecda95e2b7cf31ee7a6
 2020-11-05 13:14:16 +01:00
SpiritCroc cb2050b026 Automatic upstream merge postprocessing 
Change-Id: I2085547f6bc20a86dae82dfd4d9db047b110d80f
 2020-10-17 15:28:33 +02:00
SpiritCroc 0b082677cd [TMP] Automatic upstream merge preparation 
Change-Id: Iffad17224984f49a361e9abffb7cae217beabcff
 2020-10-17 15:09:01 +02:00
SpiritCroc 7731d5eaaf Automatic upstream merge postprocessing 
Change-Id: I2bc98a8df74965a1b0662de1fd6c68109f4559cc
 2020-09-27 13:57:54 +02:00
SpiritCroc 17ff2d76a9 [TMP] Automatic upstream merge preparation 
Change-Id: Ib66bf65ae9bfed527bec21f438456ef57b5d45d1
 2020-09-27 10:41:07 +02:00
SpiritCroc 4651bd9e4d Automatic upstream merge postprocessing 
Change-Id: I94adeba9d95496efd5e0e9bfb94ba0174bbf5933
 2020-09-17 12:03:28 +02:00
SpiritCroc dfe1a31d35 [TMP] Automatic upstream merge preparation 
Change-Id: Id475a6e7689a8bce4193be08d256c58cc0663622
 2020-09-17 11:57:41 +02:00
SpiritCroc a82ee6bc74 Automatic upstream merge postprocessing 
Change-Id: I6f2814261df91b8b4e2aeb0698cc39ea54a2899a
 2020-09-08 19:17:22 +02:00
SpiritCroc 700ff022d5 [TMP] Automatic upstream merge preparation 
Change-Id: I55e22241e686b30ee1f1674095004ea6fdb6d280
 2020-09-08 18:29:29 +02:00
SpiritCroc cd7fb3e164 Add pre_merge.sh merge helper 
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
 2020-09-08 18:29:26 +02:00