Merge branch 'master' into mattstratton/redesign

devopsdays · Jun 4, 2016 · d2cdf44 · d2cdf44
2 parents 483c8a3 + ee0a263
commit d2cdf44
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/data/events/2016-siliconvalley.yml b/data/events/2016-siliconvalley.yml
@@ -49,6 +49,8 @@ sponsors: # List all of your sponsors here along with what level of sponsorship
     level: bronze
   - id: arresteddevops
     level: community
+  - id: 2016-d4k_usa
+    level: community
 
 sponsor_levels: # In this section, list the level of sponsorships and the label to use.
   - id: gold

diff --git a/data/sponsors/2016-d4k_usa.yml b/data/sponsors/2016-d4k_usa.yml
@@ -0,0 +1,2 @@
+name: "Devoxx for Kids"
+url: "http://meetup.com/devoxx4kids-bayarea"
diff --git a/static/img/sponsors/2016-d4k_usa.png b/static/img/sponsors/2016-d4k_usa.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		name: "Devoxx for Kids"
		url: "http://meetup.com/devoxx4kids-bayarea"