summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-06-16 22:51:51 -0700
committerelijah <elijah@riseup.net>2013-06-16 22:51:51 -0700
commitdcae23368303b8205a363998e1ae0a21a2288363 (patch)
tree3bcddc63c80e33206f8d82f2c1b630d5735e7539 /pages
parentf6867632204e47e4eb2a0fc1a8855f58df931321 (diff)
updated security bingo
Diffstat (limited to 'pages')
-rw-r--r--pages/about-us/news/2012/security-bingo/en.haml7
1 files changed, 5 insertions, 2 deletions
diff --git a/pages/about-us/news/2012/security-bingo/en.haml b/pages/about-us/news/2012/security-bingo/en.haml
index f2b6fe5..6c22cea 100644
--- a/pages/about-us/news/2012/security-bingo/en.haml
+++ b/pages/about-us/news/2012/security-bingo/en.haml
@@ -72,7 +72,9 @@
%td
%tr
%td Synchronization
- %td{:colspan => 3} #{link 'Syncany' => 'http://www.syncany.org/'}, #{link 'git-annex' => 'http://git-annex.branchable.com/assistant/'}, #{link 'SparkleShare' => 'http://sparkleshare.org/'}
+ %td{:colspan => 3}
+ #{link 'seafile' => 'http://seafile.com'}, #{link 'git-annex' => 'http://git-annex.branchable.com/assistant/'}, #{link 'SparkleShare' => 'http://sparkleshare.org/'},
+ %strike #{link 'Syncany' => 'http://www.syncany.org/'}
%td
%td
%td
@@ -96,7 +98,8 @@
%tr
%td.section{:rowspan => 3} Audio/Video
%td Direct Calling
- %td{:colspan => 3} #{link 'Jitsi' => 'https://jitsi.org/'}
+ %td{:colspan => 2} #{link 'Jitsi' => 'https://jitsi.org/'}
+ %td #{link 'Jitsi' => 'https://jitsi.org/'}, #{link 'linphone' => 'http://www.linphone.org/'}, #{link 'sflphone' => 'http://sflphone.org/'}
%td
%td #{link 'RedPhone' => 'https://github.com/WhisperSystems/RedPhone'}, #{link 'CSimpleSip' => 'https://code.google.com/p/csipsimple/'}
%td