diff options
| author | Christian S <christian@pix-art.de> | 2016-04-21 21:11:19 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-21 21:11:19 +0200 |
| commit | a277d7edd596945e056f7366fdf0f13019fb60e8 (patch) | |
| tree | 9f2ee2a1d7d84f2a78fe5ae59d9b0b152d752e05 /src/main/java/eu/siacs/conversations/xmpp | |
| parent | 9e15ac10ccc4d021c10eeaed8988fa14ea73e3dc (diff) | |
| parent | ac53ae215c8d46a5b8b57958bbe467576f4a4d76 (diff) | |
Merge branch 'refs/heads/welcome-screen' into development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions