| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-10-20 | 1 | -8/+4 |
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-05-09 | 1 | -1/+3 |
| * | @Overrides addedtrz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -0/+6 |
| * | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -10/+12 |
| * | Fixed merge issue with AxolotlService (differentiation between impl and inter... | steckbrief | 2016-03-08 | 1 | -85/+104 |
| * | Fixes FS#147: Disable OMEMO | steckbrief | 2016-03-02 | 1 | -0/+1022 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |