diff options
| author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
| commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
| tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /docs/XEPs.md | |
| parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
| parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'docs/XEPs.md')
0 files changed, 0 insertions, 0 deletions