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:
Dennis Schubert 2017-02-05 10:34:48 +01:00
commit 63077bfeaf
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -20,6 +20,7 @@
## Features ## Features
* Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290) * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
* Added a link to the community guidelines :) [#7298](https://github.com/diaspora/diaspora/pull/7298)
# 0.6.3.0 # 0.6.3.0

5
app/assets/stylesheets/navbar_left.scss
View file

@ -117,6 +117,11 @@
.content { .content {
font-size: $font-size-base; font-size: $font-size-base;
} }
a,
a:hover {
color: $link-grey;
}
} }
.section { .section {

2
app/views/streams/main_stream.html.haml
View file

@ -152,7 +152,7 @@
.excellence-box .excellence-box
.content .content
%p %p
= t("layouts.application.be_excellent") = link_to t("layouts.application.be_excellent"), "https://diasporafoundation.org/community_guidelines"
.info-links .info-links
.content .content