logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 456668b490e9ee47cf773a8563a9f3a3765ce348
parent: 2286f62a36a0f5d738892a9283a696b8a45b45a6
Author: lain <lain@soykaf.club>
Date:   Fri, 28 Jun 2019 15:29:44 +0000

Merge branch 'release/1.0' into 'develop'

1.0 Release

See merge request pleroma/pleroma!1348

Diffstat:

MCHANGELOG.md2+-
Mmix.exs2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [unreleased] +## [1.0.0] - 2019-06-29 ### Security - Mastodon API: Fix display names not being sanitized - Rich media: Do not crawl private IP ranges diff --git a/mix.exs b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("0.9.0"), + version: version("1.0.0"), elixir: "~> 1.7", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(),