X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=Affiliations;h=3331d3f20ce7d56dafd94d5c64dadf66d03952af;hp=32db3014ca68efa159f19ac83526593e056c9f3d;hb=HEAD;hpb=ece6577250cfb62da9e07579721e6b1700517d76

diff --git a/Affiliations b/Affiliations
index 32db301..3523ef3 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,61 +1,74 @@
 == Current Affiliations ==
 
-Coordinator of the Infrastructure Team, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+Senior Firmware Engineer, Starship Avionics, [[http://spacex.com/ | SpaceX]]
 
-[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
+[[https://spacex.com/ | spacex-logo-small.png]]
 
-----
+---
 
-Software Engineer, [[http://www.google.com/|Google Inc.]]
+Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
 
-[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
+[[https://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
 
-----
+---
 
-Member, [[http://fsf.org/ | Free Software Foundation]]
+Member, [[https://fsf.org/ | Free Software Foundation]]
 
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[https://fsf.org/ | https://static.fsf.org/fsforg/img/logo-new.png]]
 
-----
+---
 
 Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
-[[http://fedoraproject.org | http://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
+[[https://fedoraproject.org | fedora-logo-small.png]]
 
-----
+---
 
-Founder, [[http://www.develer.com/ | Develer]]
+Lead Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
 
-[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+[[https://github.com/develersrl/bertos | bertos-logo-small.png]]
 
-----
+---
 
-Contributor, former System Architect, [[http://www.bertos.org/ | BeRTOS]]
+Maintainer, [[https://gcc.gnu.org/ | GNU C Compiler]]
 
-[[http://www.bertos.org | http://www.bertos.org/media/web-stuff/avatars/bertos-en.png]]
+[[https://gcc.gnu.org/ | https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/GNU_Compiler_Collection_logo.svg/102px-GNU_Compiler_Collection_logo.svg.png]]
 
-----
 
-Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
+== Former Affiliations ==
 
-[[http://gcc.gnu.org/ | http://upload.wikimedia.org/wikipedia/commons/c/c4/GCC_logo.png]]
+Senior Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
 
-== Former Affiliations ==
+Senior Software Engineer, [[https://careers.google.com/locations/cambridge/ | Google Cambridge]]
+
+[[https://www.google.com/ | GoogleLogoAlpha.png]]
+
+---
 
 Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
 
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[https://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+---
+
+Co-Founder, [[https://www.develer.com/ | Develer s.r.l.]]
 
-----
+[[https://www.develer.com/ | develer-logo.png]]
+
+---
 
 Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
 
-[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
+[[http://paraguayeduca.org | paraguay-educa-logo-small.png]]
 
-----
+---
 
-Contributor, [[http://uclinux.org/ | uClinux]]
+Linux Platform Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+
+[[https://laptop.org/ | OlpcLogoAlpha.png]]
 
-----
+---
+
+Contributor, [[http://uclinux.org/ | uClinux]]
 
-Operating System Engineer (volunteer), [[http://laptop.org/ | One Laptop Per Child]]
\ No newline at end of file
+[[http://www.uclinux.org/ | uclinux-logo.png]]
\ No newline at end of file