diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
| commit | 8379f695166ee9888e6e1221894c7d1494669a6d (patch) | |
| tree | b43c4b4fe72916df1dd547ab706ffae34cdcd243 /project.properties | |
| parent | c7088489bd339e4b8b5128e909a1b4377864a5c9 (diff) | |
| parent | e97b5244552c8da06b3311bccb831be30c9a641a (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'project.properties')
0 files changed, 0 insertions, 0 deletions