diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-21 20:28:09 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-21 20:28:09 +0200 |
commit | 5a6da5afaacc9a4f458addf74efc71a01473f1f5 (patch) | |
tree | 72c513593ccb0f3fe0c566a1452df930fc047a04 /project.properties | |
parent | 6d90a5cd57f7460f99381da212c667de04c73036 (diff) | |
parent | df16ecb9d6d62048ce1562ec4f2a5c7f35317ea4 (diff) |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'project.properties')
0 files changed, 0 insertions, 0 deletions