diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-27 16:44:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-27 16:44:44 -0400 |
| commit | 2e23d2a2f56f922db25d9b962825d842006b66b9 (patch) | |
| tree | 0ac8feb5de0db790374081e0d07ecffe99c033ff /doc/assistant/comment_4_c546a24459ca29025f00e424353c40d2._comment | |
| parent | 27a301bf619edf027633d5f6267cad9806b4dbe8 (diff) | |
| parent | ff8c60ca1d57965ea9c4d8c45790980f587de96c (diff) | |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'doc/assistant/comment_4_c546a24459ca29025f00e424353c40d2._comment')
0 files changed, 0 insertions, 0 deletions