| commit | 4cf78318231efd9aa68a062ebcf67481943f56e9 | [log] [download] |
|---|---|---|
| author | WHR <msl0000023508@gmail.com> | Fri Jan 03 15:28:03 2020 +0800 |
| committer | WHR <msl0000023508@gmail.com> | Fri Jan 03 15:28:03 2020 +0800 |
| tree | a22987ed0c06969d5200a3e3a26c29886e2d823c | |
| parent | 162d7bcb71aade09a8b8095693154278ec72fc6c [diff] | |
| parent | a62c2358ce3d368b7b9f99f609dbb8f50c9f660f [diff] |
Merge branch 'ssh-based-android-client' of ssh://git.code.sf.net/p/sshout/android-client-code into ssh-based-android-client Conflicts: build.gradle