Merge branch 'master' of ssh://leap.se/leap_se

Conflicts:
	pages/about-us/partners/en.md

2 files changed, 7 insertions, 7 deletions

diff --git a/pages/about-us/news/2012/security-bingo/_table.html.haml b/pages/about-us/news/2012/security-bingo/_table.html.haml
index 9091b7b..1b90875 100644
--- a/pages/about-us/news/2012/security-bingo/_table.html.haml
+++ b/pages/about-us/news/2012/security-bingo/_table.html.haml
@@ -30,9 +30,9 @@
       %td #{link 'Cryptocat' => 'https://crypto.cat'}
     %tr
       %td Long Message
-      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}, #{link 'Gpg4win' => 'http://www.gpg4win.org/about.html'}
-      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}, #{link 'GPGMail' => 'https://www.gpgtools.org/gpgmail/index.html'}
-      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}
+      %td #{link 'Enigmail' => 'https://www.enigmail.net/'}, #{link 'Gpg4win' => 'http://www.gpg4win.org/about.html'}
+      %td #{link 'Enigmail' => 'https://www.enigmail.net/'}, #{link 'GPGMail' => 'https://www.gpgtools.org/gpgmail/index.html'}
+      %td #{link 'Enigmail' => 'https://www.enigmail.net/'}
       %td
       %td #{link 'AGP' => 'http://www.thialfihar.org/projects/apg/'}
       %td
@@ -42,7 +42,7 @@
       %td Storage
       %td #{link 'DiskCryptor' => 'http://diskcryptor.net'}
       %td
-      %td #{link 'EncFS' => 'http://www.arg0.net/encfs'}, #{link 'eCryptfs' => 'http://ecryptfs.org/'}, #{link 'DMCrypt' => 'http://en.wikipedia.org/wiki/Dm-crypt'}
+      %td #{link 'EncFS' => 'http://www.arg0.net/encfs'}, #{link 'eCryptfs' => 'http://ecryptfs.org/'}, #{link 'DMCrypt' => 'https://en.wikipedia.org/wiki/Dm-crypt'}
       %td
       %td #{link 'AOSP' => 'http://source.android.com/'}, #{link 'Cryptonite' => 'https://code.google.com/p/cryptonite/'}
       %td #{link 'SafeWith.me' => 'https://SafeWith.me'}
@@ -89,9 +89,9 @@
       %td
     %tr
       %td Conference
-      %td{:colspan => 3} #{link 'Mumble' => 'http://mumble.sourceforge.net/'}
+      %td{:colspan => 3} #{link 'Mumble' => 'http://mumble.info/'}
       %td
-      %td #{link 'Mumble' => 'http://mumble.sourceforge.net/'}
+      %td #{link 'Mumble' => 'http://mumble.info/'}
       %td
     %tr
       %td Capture & Reporting
diff --git a/pages/about-us/news/2015/platform-oh-seven.md b/pages/about-us/news/2015/platform-oh-seven.md
index c6c1d31..9343892 100644
--- a/pages/about-us/news/2015/platform-oh-seven.md
+++ b/pages/about-us/news/2015/platform-oh-seven.md
@@ -1,4 +1,4 @@
-@title = "Platform release 7.0"
+@title = "Platform release 0.7"
 @author = 'Micah'
 @posted_at = '2015-06-11'
 @more = true