Merge branch 'master' into dev

duckduckgo · Mar 18, 2015 · b750d1a · b750d1a
2 parents 5a19b16 + bd09db6
commit b750d1a
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ddg_community_platform",
-  "version": "0.60.0",
+  "version": "0.64.0",
   "engines": {
     "node": ">=0.10.0"
   },

diff --git a/root/static/css/ddgc0.60.0.css b/root/static/css/ddgc0.60.0.css
diff --git a/root/static/css/ddgc0.61.0.css b/root/static/css/ddgc0.61.0.css
diff --git a/root/static/css/ddgc0.62.0.css b/root/static/css/ddgc0.62.0.css
diff --git a/root/static/css/ddgc0.63.0.css b/root/static/css/ddgc0.63.0.css
diff --git a/root/static/css/ia0.60.0.css b/root/static/css/ia0.60.0.css
diff --git a/root/static/css/ia0.61.0.css b/root/static/css/ia0.61.0.css
diff --git a/root/static/css/ia0.62.0.css b/root/static/css/ia0.62.0.css
diff --git a/root/static/css/ia0.63.0.css b/root/static/css/ia0.63.0.css
diff --git a/root/static/js/ddgc0.60.0.js b/root/static/js/ddgc0.60.0.js