From: kaniini <nenolod@gmail.com>
Date: Wed, 21 Nov 2018 16:53:38 +0000 (+0000)
Subject: Merge branch 'feature/improve-version' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=182e3e8da2e5dbb8e8b7b514ad8bbdf242b37b59;p=akkoma

Merge branch 'feature/improve-version' into 'develop'

Improved version string

See merge request pleroma/pleroma!467
---

182e3e8da2e5dbb8e8b7b514ad8bbdf242b37b59
diff --cc lib/pleroma/application.ex
index 30f0b14c8,50adf68df..2d86efae5
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -1,9 -1,14 +1,15 @@@
  defmodule Pleroma.Application do
    use Application
  
+   @name "Pleroma"
+   @version Mix.Project.config()[:version]
+   def name, do: @name
+   def version, do: @version
+   def named_version(), do: @name <> " " <> @version
+ 
    # See http://elixir-lang.org/docs/stable/elixir/Application.html
    # for more information on OTP Applications
 +  @env Mix.env()
    def start(_type, _args) do
      import Supervisor.Spec
      import Cachex.Spec