diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-17 16:12:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-17 16:12:03 -0400 |
| commit | 12c5d34ee28c2d786b7f3ab0e17a590068231ed9 (patch) | |
| tree | 42d2a6e34f3e1db9084d561937b3efc8cd521f93 /doc/contributing.mdwn | |
| parent | 2544986bf452d8c780d547714070d978396fb836 (diff) | |
| parent | 64a297d11464d1358ecbd47c4901cb11c32cf4c1 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
Diffstat (limited to 'doc/contributing.mdwn')
0 files changed, 0 insertions, 0 deletions