[tor-commits] [webwml/staging] Merge branch 'staging'

[sebastian@xxxxxxxxxxxxxx]

commit 1e4e965c1012934f5da78f47077fcc17db83c661
Merge: 995f9e3 aa38962
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Thu Nov 13 19:18:15 2014 +0100

    Merge branch 'staging'
    
    Conflicts:
    	projects/en/torbrowser.wml

 .gitignore                  |   19 +++++----
 docs/en/tor-doc-relay.wml   |   55 --------------------------
 docs/en/tor-doc-windows.wml |   90 +++----------------------------------------
 include/blog-recent.wmi     |    9 +++++
 include/head.wmi            |   59 +++++++++++++++-------------
 projects/en/torbrowser.wml  |   33 ++++++++--------
 6 files changed, 75 insertions(+), 190 deletions(-)

diff --cc projects/en/torbrowser.wml
index 1910761,ddd492b..9aef167
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@@ -508,9 -508,9 +508,10 @@@
          </table>
        </div>
        </div>
+ -->
      </div>
        </div>
- -->
++
        <div id="macosx" class="anchor"></div>
        <div class="macosx box">
      <div class="pjtitle"><h2>Mac OSÂ X Instructions</h2></div>



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