| Commit message (Collapse) | Author | Files | Lines |
|
accounts. fixed #443 fixed #442
|
|
|
|
Conflicts:
src/eu/siacs/conversations/persistance/FileBackend.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
permissions. fixed #150 fixed #177 fixed #333 - this might need some more polish though
|
|
non matching sha sum
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and unified encrypted and unencrypted file attachment
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ui on the receiving end
|
|
are now threaded
|
|
|
|
|
|
|