| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
shareable uri where ever possible
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/main/res/values/strings.xml
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/main/res/values/strings.xml
|
| |/ |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
https://github.com/siacs/Conversations into feature/otr_verification
Conflicts:
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/
|/| |
|
| | |
|
|/
|
|
| |
insane work arounds
|
|
|
|
| |
from Element
|
| |
|
|
|
|
| |
jid)
|
|
|
|
| |
Remove `Account.getFullJid()'
|
| |
|
| |
|
| |
|