[tor-commits] [atlas/master] Merge pull request #10 from mzeltner/master

[art at torproject.org]

commit 8ef4f59f6f0725662ce81f3ecb9dbd97c938db8d
Merge: d7e68fb e8b2299
Author: Arturo Filastò <hellais at gmail.com>
Date:   Wed Feb 22 22:17:53 2012 -0800

    Merge pull request #10 from mzeltner/master
    
    Include family in relay view

 js/models/relay.js          |    1 +
 templates/details/main.html |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)