From 992ed6b9bbf832675257d67ef855c939b10e899e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= <tao@btao.org>
Date: Sat, 10 Aug 2019 14:56:46 +0300
Subject: [PATCH] release 2.6.0

---
 CHANGELOG.md              | 16 ++++++++++++++++
 backend/config/config.exs |  2 +-
 backend/mix.exs           |  2 +-
 frontend/package.json     |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 545672e..db039b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [2.6.0 - 2019-08-10]
+
+### Added
+
+- Add nodeinfo and GNU Social crawler.
+  - Thanks to nodeinfo, Peertube and Writefreely are now also displayed on the map.
+  - Note that the information about connections comes from other instances.
+
+### Changed
+
+- You can now zoom slightly further out on the map to see more of the fediverse at once.
+
+### Fixed
+
+- Database deletions are now properly handled with `ON DELETE CASCADE` where necessary.
+
 ## [2.5.0 - 2019-08-08]
 
 ### Added
diff --git a/backend/config/config.exs b/backend/config/config.exs
index c95890f..8ded955 100644
--- a/backend/config/config.exs
+++ b/backend/config/config.exs
@@ -22,7 +22,7 @@ config :backend, Backend.Repo, queue_target: 5000
 
 instances_config_path =
   if System.get_env("MIX_ENV") == "prod",
-    do: "lib/backend-2.5.0/priv/elasticsearch/instances.json",
+    do: "lib/backend-2.6.0/priv/elasticsearch/instances.json",
     else: "priv/elasticsearch/instances.json"
 
 config :backend, Backend.Elasticsearch.Cluster,
diff --git a/backend/mix.exs b/backend/mix.exs
index 9f8c580..2be5ac5 100644
--- a/backend/mix.exs
+++ b/backend/mix.exs
@@ -4,7 +4,7 @@ defmodule Backend.MixProject do
   def project do
     [
       app: :backend,
-      version: "2.5.0",
+      version: "2.6.0",
       elixir: "~> 1.5",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
diff --git a/frontend/package.json b/frontend/package.json
index 15561a4..1a8f1ac 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": true,
   "scripts": {
     "start": "NODE_ENV=development react-scripts start",