1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-25 22:01:16 +00:00

Cherry-pick syncthing commit for conflicts hot-fix

This commit is contained in:
Simon Frei 2022-11-08 18:06:34 +01:00
parent ed6224b92e
commit 35abeff715
No known key found for this signature in database
GPG key ID: 7C31D23ECB1006F3

@ -1 +1 @@
Subproject commit abb921acbc21191f18ac4a6884f5296acb216e86
Subproject commit 15c0afec055b935870b05af4483a0598d2e84dbb