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:
Jonne Haß 2015-06-17 12:40:27 +02:00
commit 93281d283f
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

@ -49,6 +49,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
## Bug fixes ## Bug fixes
* Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105) * Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)
* Fix wrong closing a-tag [#6111](https://github.com/diaspora/diaspora/pull/6111)
## Features ## Features
* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090) * Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)

2
app/assets/templates/tag_following_tpl.jst.hbs
View file

@ -1,4 +1,4 @@
<a href="#" id="unfollow_{{name}}" rel="nofollow" class="action delete_tag_following pull-right" title="{{t "delete"}}">&times;<a/> <a href="#" id="unfollow_{{name}}" rel="nofollow" class="action delete_tag_following pull-right" title="{{t "delete"}}">&times;</a>
<a href="/tags/{{name}}" class="selectable"> <a href="/tags/{{name}}" class="selectable">
#{{ name }} #{{ name }}
</a> </a>