Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-11 | 1 | -153/+75 |
|\ | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 1 | -12/+14 |
|\| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 1 | -2/+2 |
|\| | |||||
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 1 | -183/+0 |
| | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | ||||
* | | Merge tag '1.5.2' into trz/rebase | lookshe | 2015-08-11 | 1 | -70/+66 |
|/ | |||||
* | always add a non resolved SRV record to the list | iNPUTmice | 2015-02-09 | 1 | -6/+1 |
| | |||||
* | more patches for dns helper | iNPUTmice | 2014-12-14 | 1 | -13/+19 |
| | |||||
* | possible dns fixes | iNPUTmice | 2014-12-14 | 1 | -2/+11 |
| | |||||
* | Move a chunk of classes over to using JID objects | Sam Whited | 2014-11-09 | 1 | -6/+8 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -32/+18 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+185 |