nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Jonne Haß 2020-11-02 15:34:08 +01:00
commit 6a4a983fa1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -37,6 +37,7 @@ Although the chat was never enabled per default and was marked as experimental,
## Bug fixes ## Bug fixes
* Update comment counter when weleting a comment in the Single Post View [#7938](https://github.com/diaspora/diaspora/pull/7938) * Update comment counter when weleting a comment in the Single Post View [#7938](https://github.com/diaspora/diaspora/pull/7938)
* Link diaspora only poduptime list [#8174](https://github.com/diaspora/diaspora/pull/8174)
## Features ## Features
* Support and recommend TOML as configuration format [#8132](https://github.com/diaspora/diaspora/pull/8132) * Support and recommend TOML as configuration format [#8132](https://github.com/diaspora/diaspora/pull/8132)

2
app/views/registrations/_registrations_closed.haml
View file

@ -5,7 +5,7 @@
wiki: link_to(t("registrations.closed.another_pod"), "https://diasporafoundation.org/getting_started/sign_up")) wiki: link_to(t("registrations.closed.another_pod"), "https://diasporafoundation.org/getting_started/sign_up"))
!= t("registrations.closed.find_pods", != t("registrations.closed.find_pods",
poduptime: link_to("Poduptime", "https://podupti.me/")) poduptime: link_to("Poduptime", "https://diaspora.podupti.me/"))
!= t("registrations.closed.other_questions", != t("registrations.closed.other_questions",
wiki: link_to("Wiki", "https://wiki.diasporafoundation.org/Choosing_a_pod")) wiki: link_to("Wiki", "https://wiki.diasporafoundation.org/Choosing_a_pod"))