mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-12-02 01:01:17 +00:00
Cherry-pick syncthing commit for conflicts hot-fix
This commit is contained in:
parent
ed6224b92e
commit
35abeff715
1 changed files with 1 additions and 1 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit abb921acbc21191f18ac4a6884f5296acb216e86
|
Subproject commit 15c0afec055b935870b05af4483a0598d2e84dbb
|
Loading…
Reference in a new issue