hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin' into validate-user-info

Browse source
This commit is contained in:
lain 2018-11-30 17:34:20 +01:00
commit d0ec2812bd
46 changed files with 1043 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -197,7 +197,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
end
def version(conn, _params) do
version = Pleroma.Config.get([:instance, :version])
version = Pleroma.Application.named_version()
case get_format(conn) do
"xml" ->