From: Brian Warner Date: Tue, 2 Sep 2014 21:01:24 +0000 (-0700) Subject: Merge branch tarcieri/redesigned-directory-page X-Git-Tag: allmydata-tahoe-1.10.1a1~151 X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/simplejson/?a=commitdiff_plain;h=c4da6c91a79794d2af2a7b36a07785a823d70a46;p=tahoe-lafs%2Ftahoe-lafs.git Merge branch tarcieri/redesigned-directory-page Closes ticket:1966 (trac) Closes tahoe-lafs/tahoe-lafs#32 (github PR) --- c4da6c91a79794d2af2a7b36a07785a823d70a46