Merge branch 'release/1.0' into 'develop'

1.0 Release

See merge request pleroma/pleroma!1348

diff --combined mix.exs
index 0850fad2792221590f2d79d82d918f4b9a2fb9dc,cf413f12bf66b84126fe685ca66ce838fcc22f99..19a80ffb205a2e68e35442b82eb0474f88dd6c1b
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -4,7 -4,7 +4,7 @@@ defmodule Pleroma.Mixfile d
    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(),
@@@ -37,7 -37,7 +37,7 @@@
          pleroma: [
            include_executables_for: [:unix],
            applications: [ex_syslogger: :load, syslog: :load],
 -          steps: [:assemble, &copy_files/1]
 +          steps: [:assemble, &copy_files/1, &copy_nginx_config/1]
          ]
        ]
      ]
@@@ -48,15 -48,6 +48,15 @@@
      release
    end
  
 +  def copy_nginx_config(%{path: target_path} = release) do
 +    File.cp!(
 +      "./installation/pleroma.nginx",
 +      Path.join([target_path, "installation", "pleroma.nginx"])
 +    )
 +
 +    release
 +  end
 +
    # Configuration for the OTP application.
    #
    # Type `mix help compile.app` for more information.