diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-09 14:16:51 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-09 14:16:51 +0200 |
| commit | c02ef8008621049b803803fd131626c2365035ae (patch) | |
| tree | cbfdcafb0c71cfd58322c6816b1a17a54d999f44 /.gitmodules | |
| parent | facb1242b6694ea2d4ed5c7dbd92e4a96d288ea3 (diff) | |
| parent | 0f4ba6101c535a5373302bcfa2f77deb6ad42d3d (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Conflicts:
src/eu/siacs/conversations/crypto/PgpEngine.java
src/eu/siacs/conversations/persistance/FileBackend.java
src/eu/siacs/conversations/ui/ShareWithActivity.java
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions