Merge branch 'master' into glitch-soc/tentative-merge

Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.

1 files changed, 2 insertions, 2 deletions

diff --git a/scalingo.json b/scalingo.json
index 0cc648f02..873731ac9 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -97,7 +97,7 @@
     "postdeploy": "bundle exec rails db:migrate && bundle exec rails db:seed"
   },
   "addons": [
-    "scalingo-postgresql",
-    "scalingo-redis"
+    "postgresql",
+    "redis"
   ]
 }