]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
projects / tahoe-lafs / tahoe-lafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce7a867 1b83f78)
Merge pull request #142 from tahoe-lafs/754.location-AUTO.2
authorDaira Hopwood <daira@jacaranda.org>
Tue, 10 Feb 2015 18:28:09 +0000 (18:28 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 10 Feb 2015 18:28:09 +0000 (18:28 +0000)
Allow combining autodetected and statically configured locations


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.