summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-04-24 10:42:52 -0700
committerelijah <elijah@riseup.net>2014-04-24 10:42:52 -0700
commit45e99e6ad8f22f9b44da2eebe415dc502f68f49c (patch)
tree25a009365c0455d5d5c85dccc67de7f3b58c76eb
parent690aa0eb5e6c534d424d9e0522eab6bbbfad925c (diff)
added gsoc news item
-rw-r--r--pages/about-us/news/2014/gsoc.haml9
-rw-r--r--public/img/pages/gsoc.pngbin0 -> 7370 bytes
2 files changed, 9 insertions, 0 deletions
diff --git a/pages/about-us/news/2014/gsoc.haml b/pages/about-us/news/2014/gsoc.haml
new file mode 100644
index 0000000..9c832f5
--- /dev/null
+++ b/pages/about-us/news/2014/gsoc.haml
@@ -0,0 +1,9 @@
+- @title = 'Google Summer of Code 2014'
+- @author = 'Mcnair'
+- @posted_at = '2014-04-24'
+- @more = false
+- @preview = capture_haml do
+ %div{:style => 'float:right; margin: 8px; margin-right: 0;'}
+ %img{:src => "/img/pages/gsoc.png"}
+ %p LEAP has selected three Google Summer of Code projects that we are really excited about. One focuses on improving Soledad transport, another on better Windows integration, and a third on adding obfsproxy to the encrypted internet proxy. Congradulations to the students who submitted these projects, they stood out above the rest of the proposals.
+ %p In the coming months, stay tuned for updates on the progress made to these Google Summer of Code projects.
diff --git a/public/img/pages/gsoc.png b/public/img/pages/gsoc.png
new file mode 100644
index 0000000..9278120
--- /dev/null
+++ b/public/img/pages/gsoc.png
Binary files differ