summaryrefslogtreecommitdiff
path: root/doc/bugs/assistant_-_GTalk_collision.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-10-26 13:17:19 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-10-26 13:17:19 -0400
commit42eb53d3aa3e2beb6eedbe9485e9e062e751c854 (patch)
tree6d3c34a6d78690ee585358632bac4c8364a64fa1 /doc/bugs/assistant_-_GTalk_collision.mdwn
parent1a9da6bbe06818822e90018c9c5c3ba3146c25f9 (diff)
parent9558d0cf34c9c5d4aa345e447885806ec8fcd823 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/bugs/assistant_-_GTalk_collision.mdwn')
0 files changed, 0 insertions, 0 deletions