mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
24856 commits 6 branches 120 tags 229 MiB
Commit graph

9 commits

Author SHA1 Message Date
SpiritCroc
791766dce2 pre_merge.sh: tag last pre-merge commit 
Change-Id: Iaf7ffada4c7cc77b85547e7b3c64aaa96e80b64b
 2022-11-18 15:13:36 +01:00
SpiritCroc
715eefe184 [merge] Update merge helpers for moved resources 
Change-Id: I09de3d8c78e69386fe6020e8d1aa0f4d1b7aa9b6
 2022-09-10 15:36:20 +02:00
SpiritCroc
f57dd91035 merge_helpers.sh: depend less on upstream tags 
Change-Id: Ic79931eba7d501e4f76e5dd069921f9f3486f86c
 2022-09-07 19:46:33 +02:00
SpiritCroc
61e9bfce5b pre_merge.sh: Fix when last merge was not tagged 
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
 2021-04-09 11:55:15 +02:00
SpiritCroc
c30a9b8a57 Move restore_{sc,upstream} to merge_helpers.sh 
Easier to use manually

Change-Id: Ieb87301e2b0b5d7e1299d3d0c8d49992d4cdde63
 2020-12-22 09:15:42 +01:00
SpiritCroc
ac57b10968 pre_merge.sh: Better upstream string change revert 
Change-Id: Iff217eea5b115f244bfa6e34faf35f430f638a7d
 2020-12-12 14:30:20 +01:00
SpiritCroc
8c5a8b9a2f Customize github templates 
Change-Id: Ifcfcbdfefe24aa24c9e1c32ca7674feee1c4db80
 2020-11-25 09:29:16 +01:00
SpiritCroc
7d467d622a Update merge helpers 
Change-Id: I2da35a52c6f7209acc822c7fd878255df082bc52
 2020-09-08 19:17:15 +02:00
SpiritCroc
cd7fb3e164 Add pre_merge.sh merge helper 
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
 2020-09-08 18:29:26 +02:00