diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:52:15 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:52:15 +0100 |
| commit | 35bf13f5effd802f57b9f3633115fed479e14f1e (patch) | |
| tree | ab21e6d9f954ce6ad3b30af6ffcf7180d2ca7484 /src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java | |
| parent | 07b07115d684b27ebc0c3ee4f70ef2e33a3b2dbb (diff) | |
| parent | 41f7848f2ca48b31ad7fd865490347fe26f60c2b (diff) | |
Merge branch 'feature/file_transfer' into development
Conflicts:
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java')
0 files changed, 0 insertions, 0 deletions