Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
Roger Dingledine commited on 2015-05-05 04:35:33
Zeige 1 geänderte Dateien mit 5 Einfügungen und 0 Löschungen.
Conflicts: press/en/info.wmi
- press/en/info.wmi 9c9e307f4..52968ffbe
| ... | ... |
@@@ -7,7 -7,8 +7,12 @@@ |
| 7 | 7 |
<h2 class="media">Press Contact</h2> |
| 8 | 8 |
<p> |
| 9 | 9 |
<b>Tor Press Team</b><br> |
| 10 |
++<<<<<<< HEAD |
|
| 10 | 11 |
+ execdir@torproject.org<br> |
| 12 |
++======= |
|
| 13 |
+ press@torproject.org<br> |
|
| 14 |
+ +1-617-902-0208 |
|
| 15 |
++>>>>>>> 5628d54898b63540d5df3179261a9cdd591fd970 |
|
| 11 | 16 |
</p> |
| 12 | 17 |
</div> |
| 13 | 18 |
<!-- END INFOBLOCK --> |
| 14 | 19 |