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

105 Commits

Author SHA1 Message Date
SpiritCroc 2ea5555036 Automatic upstream merge postprocessing 
Change-Id: Id1f5d78f899dc188eb6e13aa0bb933d094415e13
 2022-07-17 18:52:57 +02:00
SpiritCroc 0d9fbb0ce7 [TMP] Automatic upstream merge preparation 
Change-Id: I2965d09aae5a200cbb9230dae676ef4009c9cc2c
 2022-07-15 09:35:12 +02:00
SpiritCroc ac1f10daf3 Automatic upstream merge postprocessing 
Change-Id: I6379ec2eb0f06acf06de29d307d2fdb8f7ed93e8
 2022-07-09 18:16:38 +02:00
SpiritCroc 41af64c8e6 [TMP] Automatic upstream merge preparation 
Change-Id: Ic181c1c7674686fc24f1e9da6765a4295598098a
 2022-07-09 10:05:27 +02:00
SpiritCroc 5bce0e1300 Automatic upstream merge postprocessing 
Change-Id: Id7304f3ef6101969915853b88b0a06a596548295
 2022-06-14 10:14:05 +02:00
SpiritCroc 4778d7cb5b [TMP] Automatic upstream merge preparation 
Change-Id: Icf897adc9be76c7d19e4ee8bd1369c6532d0852d
 2022-06-14 10:05:26 +02:00
SpiritCroc 49121000c5 Automatic upstream merge postprocessing 
Change-Id: I8e5240c6060b2585a5e6be7f95fca5a48346dd75
 2022-06-07 15:33:58 +02:00
SpiritCroc 753da88597 [TMP] Automatic upstream merge preparation 
Change-Id: I83744c522088410f134452fd7e33b16996c6b01c
 2022-06-07 15:33:50 +02:00
SpiritCroc 7d11e65d5c Automatic upstream merge postprocessing 
Change-Id: I4c4223cf78f61cc610afc2f0d2e0b8f2b15108cf
 2022-06-01 15:28:26 +02:00
SpiritCroc fab9a100a1 [TMP] Automatic upstream merge preparation 
Change-Id: I00f10005575cf818d47ea47798ff8af4f4891c06
 2022-06-01 12:20:10 +02:00
SpiritCroc e7ffd128dc Automatic upstream merge postprocessing 
Change-Id: Id00a9dd26823196ffca4fbd64513875011bd2969
 2022-05-18 10:00:20 +02:00
SpiritCroc 360f469c4c [TMP] Automatic upstream merge preparation 
Change-Id: Idb8470d85e1279feb5fdf4f891aaf91c47b78dbc
 2022-05-17 22:06:28 +02:00
SpiritCroc cf3036de22 Automatic upstream merge postprocessing 
Change-Id: Ia795352ccd15a5c17d71090d221cbedb51a96874
 2022-05-05 17:41:28 +02:00
SpiritCroc 11194546a7 [TMP] Automatic upstream merge preparation 
Change-Id: I3d17203abc4c7c8b681ba3d23483f76d3b5c2caa
 2022-05-05 14:26:49 +02:00
SpiritCroc 9dba0689e3 Automatic upstream merge postprocessing 
Change-Id: I59eaeaadcbec25a8e3e97ac0df4989731e1eefa0
 2022-04-26 17:51:35 +02:00
SpiritCroc fec5193ec6 [TMP] Automatic upstream merge preparation 
Change-Id: I19f122ebca5575b42c24e3b6757b44bfdb6526d6
 2022-04-26 15:31:18 +02:00
SpiritCroc a4890457e7 Automatic upstream merge postprocessing 
Change-Id: I90adddf6afb6bd838c7c9b8b70dda654e0247b6d
 2022-04-24 11:15:56 +02:00
SpiritCroc 589ce215de [TMP] Automatic upstream merge preparation 
Change-Id: I889085ec4626c8bad3c6eeb4aba0b9d57799d6f2
 2022-04-24 10:47:15 +02:00
SpiritCroc 4c457de2eb Automatic upstream merge postprocessing 
Change-Id: Ia380e6cb16012ca8e2902918eee60a24d893749a
 2022-04-12 11:57:23 +02:00
SpiritCroc 97b181997f [TMP] Automatic upstream merge preparation 
Change-Id: Ia7ca6b9e94631fc9ccfa911669376a472f5012d5
 2022-04-12 11:07:58 +02:00
SpiritCroc 3322a6fde6 Automatic upstream merge postprocessing 
Change-Id: I2d763d8cb40866f8cf8b21a1750bf487f291c90f
 2022-03-30 15:53:52 +02:00
SpiritCroc a6c3ae3bb0 [TMP] Automatic upstream merge preparation 
Change-Id: I5c089c587d4c19472de02cb3f704736c9461430d
 2022-03-30 14:57:34 +02:00
SpiritCroc db3891b4c3 Automatic upstream merge postprocessing 
Change-Id: I60e8f659740659d74f1d918525abff353d5f2cfc
 2022-03-10 13:26:53 +01:00
SpiritCroc 7437d621b2 [TMP] Automatic upstream merge preparation 
Change-Id: I0d2270e32eca2d08e9fb1479cf3081af92d2b796
 2022-03-10 13:09:24 +01:00
SpiritCroc d77c42f8c1 Automatic upstream merge postprocessing 
Change-Id: Iaf674a4d25857de93b86e4162b51688ed113553f
 2022-03-04 11:43:00 +01:00
SpiritCroc ab9bf0cb7d [TMP] Automatic upstream merge preparation 
Change-Id: I643396f8586b594412dbd97284256165fd843f7b
 2022-03-04 10:48:35 +01:00
SpiritCroc 62fa413d6f Automatic upstream merge postprocessing 
Change-Id: I4554e89d78a075a40e054aa68fe905fe75f3edb1
 2022-02-20 11:29:31 +01:00
SpiritCroc 24ba2296b1 [TMP] Automatic upstream merge preparation 
Change-Id: I982dbbb3a4a0ac816b0df51cc165c94fe308402a
 2022-02-13 18:31:39 +01:00
SpiritCroc be016b253f Automatic upstream merge postprocessing 
Change-Id: I33e1c359a79d9421a689295976d93f5ec0697026
 2022-01-29 15:56:25 +01:00
SpiritCroc 0eddb5ed75 [TMP] Automatic upstream merge preparation 
Change-Id: I367672d6824d7e49f7393247372314c816d05ceb
 2022-01-29 10:36:12 +01:00
SpiritCroc 832b684550 Automatic upstream merge postprocessing 
Change-Id: I4a541aa3f5f767b9b7c1cecd22b8ecf3adedbf99
 2021-12-23 14:42:23 +01:00
SpiritCroc 43ba77577b [TMP] Automatic upstream merge preparation 
Change-Id: I07249d2b85b4bd78844e5e74c0245116e9119499
 2021-12-23 09:55:24 +01:00
SpiritCroc 1bcf341ec3 Automatic upstream merge postprocessing 
Change-Id: I35fd8386a4640b7bc8010d3d5d8384b235f4bd06
 2021-12-05 13:51:40 +01:00
SpiritCroc cd2021d5ec [TMP] Automatic upstream merge preparation 
Change-Id: Id9ef970ed0d0c41e8b78677352c43cb25e0fe0da
 2021-12-05 13:23:05 +01:00
SpiritCroc 54fba60046 Automatic upstream merge postprocessing 
Change-Id: I53832e007d7c439a60c9e38e8c736aec6631b6ba
 2021-11-17 20:20:45 +01:00
SpiritCroc ad4225007e [TMP] Automatic upstream merge preparation 
Change-Id: I1c48269e833b447bcb137970c2db07cfe1d3e984
 2021-11-06 10:03:45 +01:00
SpiritCroc 6c99527ab8 Fix fastlane 
I messed up with an unclean 1.3.3 merge

Change-Id: I2e1b140e165a8c8ca03728bfb1497db4f523e3a2
 2021-11-01 10:43:45 +01:00
SpiritCroc e4f36f17a2 Automatic upstream merge postprocessing 
Change-Id: I54c9b9df50bd6fb4b8cde241701c4f3e3ecb92cb
 2021-10-27 15:25:08 +02:00
SpiritCroc 28e1c6d272 [TMP] Automatic upstream merge preparation 
Change-Id: I1d67b75cd2ada1deba3008ccc75cac72881a7e1a
 2021-10-27 15:24:57 +02:00
SpiritCroc af489701a8 Automatic upstream merge postprocessing 
Change-Id: I0fa90d77fe47074d677355b0025e1611e598d565
 2021-10-25 19:30:04 +02:00
SpiritCroc d1468a50d2 [TMP] Automatic upstream merge preparation 
Change-Id: I52165397a64804cfc00893eb6484e73cf648f3bb
 2021-10-25 19:29:51 +02:00
SpiritCroc 8171a85657 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
 2021-10-22 11:16:40 +02:00
SpiritCroc 5d83211995 Automatic upstream merge postprocessing 
Change-Id: Iae698de2ab9d37e10f4ad845d3e28f047bc69df3
 2021-10-21 17:42:29 +02:00
SpiritCroc 969fa9fb26 [TMP] Automatic upstream merge preparation 
Change-Id: I40d5b4920f7f5f8e75167ae3382d585b8a5d38aa
 2021-10-21 16:27:34 +02:00
SpiritCroc 57a9ea4617 Merge tag 'v1.3.3' into sc 
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
 2021-10-11 12:42:06 +02:00
SpiritCroc bba7a691e0 Automatic upstream merge postprocessing 
Change-Id: I28aa960c79bf4807aab871ff8128d2339309342c
 2021-10-11 10:39:16 +02:00
SpiritCroc 44797fc2dc [TMP] Automatic upstream merge preparation 
Change-Id: I47dbe78febc16601fcd4e43ca4187d7735f709a8
 2021-10-08 18:50:23 +02:00
SpiritCroc 6464142a91 Automatic upstream merge postprocessing 
Change-Id: I1e1f12676768cf300e99e10e0c4d2a7c70ee859a
 2021-09-30 09:30:52 +02:00
SpiritCroc e9e6275335 [TMP] Automatic upstream merge preparation 
Change-Id: If69bf7097f303eeac3d7a5878ade87e2bae28315
 2021-09-30 09:19:30 +02:00
SpiritCroc b4439db163 Automatic upstream merge postprocessing 
Change-Id: Ifbee07c8f513672d861096f700749c4f41fb19ff
 2021-09-29 09:55:06 +02:00