Skip to content

GitLab

pleroma
pleroma
Commit 456668b4 authored by lain's avatar lain
Browse files
Options

Merge branch 'release/1.0' into 'develop' 

1.0 Release

See merge request pleroma/pleroma!1348
parents 2286f62a da17bdd8
Pipeline #14054 canceled with stages
        in 20 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        CHANGELOG.md
        View file @ 456668b4
        ......@@ -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
        ......
        mix.exs
        View file @ 456668b4
        ......@@ -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(),
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment