Merge branch 'develop' into refresh

2013-11-11 09:14:17 +13:00 · 2013-11-11 09:14:17 +13:00 · a41eb47551
commit a41eb47551
parent 355f5ce2e6 12e2a445d7
2 changed files with 22 additions and 34 deletions
--- a/config.default
+++ b/config.default
@ -53,8 +53,7 @@
    "wunderground": "",
    "googletranslate": "",
    "rdio_key": "",
-    "rdio_secret": "",
-    "steam_key": ""
+    "rdio_secret": ""
  },
  "disabled_plugins": []
 }