mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-12-05 04:31:07 +01:00
This also fixes a errornous merge where the same branch with different commit was merged into master and 4.4 The conflicting commits are 4.4: |
||
|---|---|---|
| .. | ||
| src | ||
| build.gradle | ||