merge fix

futuraio · Apr 15, 2014 · 925c3af · 925c3af
2 parents e2b5b69 + 1b1500c
commit 925c3af
Show file tree

Hide file tree

Showing 47 changed files with 339 additions and 11,046 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/_config.yml b/_config.yml
diff --git a/_layouts/default.html b/_layouts/default.html
diff --git a/_layouts/post.html b/_layouts/post.html
diff --git a/_posts/2013-06-09-the-state-of-interaction-prototyping.md b/_posts/2013-06-09-the-state-of-interaction-prototyping.md
diff --git a/_posts/2013-06-19-not-another-ios7-post.md b/_posts/2013-06-19-not-another-ios7-post.md
diff --git a/assets/components/jquery/.bower.json b/assets/components/jquery/.bower.json
diff --git a/assets/components/jquery/.gitignore b/assets/components/jquery/.gitignore
diff --git a/assets/components/jquery/README.md b/assets/components/jquery/README.md
diff --git a/assets/components/jquery/bower.json b/assets/components/jquery/bower.json
diff --git a/assets/components/jquery/component.json b/assets/components/jquery/component.json
diff --git a/assets/components/jquery/composer.json b/assets/components/jquery/composer.json