Commit 4e523c5f authored by akwizgran's avatar akwizgran

Merge branch '1242-display-image-attachments' into 'master'

[android] refactor conversation items and view holders

See merge request !984
parents 50cc0a68 3bfa5e20
Pipeline #2743 passed with stage
in 11 minutes and 27 seconds