[tor-commits] [compass/master] Merge remote-tracking branch 'gsathya/bug_6639'

[karsten@xxxxxxxxxxxxxx]

commit ee57adb1bd2c31a13b61cbfc5e371d965b866150
Merge: 6a2de26 b22497f
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Sun Sep 9 17:37:43 2012 -0400

    Merge remote-tracking branch 'gsathya/bug_6639'
    
    Conflicts:
    	templates/result.html

 static/img/compass-logo.jpg |  Bin 0 -> 3938 bytes
 templates/index.html        |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc templates/index.html
index 85fd634,e51f6d0..65a5c6a
--- a/templates/index.html
+++ b/templates/index.html
@@@ -48,10 -48,10 +48,10 @@@
  
      <div class="container">
        <div class="hero-unit">
 -        <form class="form-horizontal" action="{{ url_for('result') }}"
 +        <form class="form-horizontal" action=""
                method=get id="form">
            <fieldset>
-             <legend>Tor Relay Stats</legend>
+             <legend>Compass</legend>
              <div class="control-group">
                <h3> Filter </h3>
                <label class="control-label" for="inactive">Inactive</label>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits