aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-1/+0
|\
| * made it possible to go back to welcome screen from edit accountDaniel Gultsch2016-04-271-1/+0
* | modified welcome screenChristian S2016-04-211-1/+1
|/
* added magic create welcome screenDaniel Gultsch2016-04-191-0/+37