| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java | ||||
| | * | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 1 | -33/+0 |
| |/ | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | ||||
| * | support for XEP-0092: Software Version | iNPUTmice | 2015-02-16 | 1 | -11/+3 |
| | | |||||
| * | Convert about dialog to activity | Sam Whited | 2014-11-04 | 1 | -0/+41 |
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |