diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-06 18:26:40 -0600 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-06 18:26:40 -0600 |
| commit | d6f65aed168b49f63bc527d81de0ce3fceb8ad76 (patch) | |
| tree | 3b9de67e92e6976dddd289a3cd1fbba53d3e6339 /Logs | |
| parent | 62876502c55958cd8f716d6676eb97825456d9b7 (diff) | |
| parent | 8ad844e45c3f8a65ef5b725e9c6ac0f414b50fa4 (diff) | |
Merge branch 'master' into assistant
Conflicts:
doc/design/assistant/syncing.mdwn
Diffstat (limited to 'Logs')
0 files changed, 0 insertions, 0 deletions