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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-01-24 07:13:11 +01:00
commit b1aa8aacfd
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -110,6 +110,7 @@ Contributions are very welcome, the hard work is done!
## Features ## Features
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files) * Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
* Add the podmin email address to 500 errors [#6652](https://github.com/diaspora/diaspora/pull/6652)
# 0.5.6.1 # 0.5.6.1

4
app/views/errors/error_500.haml
View file

@ -7,6 +7,10 @@
Internal server error. Internal server error.
Our bad! Sorry about that. :( Our bad! Sorry about that. :(
- if AppConfig.admins.podmin_email?
%p
Drop us an email to <a href="mailto:#{AppConfig.admins.podmin_email}">#{AppConfig.admins.podmin_email}</a>.
%p %p
%a{href: "javascript:history.back()"} %a{href: "javascript:history.back()"}
Go Back? Go Back?