Merge branch 'next-minor' into develop

Changelog.md

@@ -10,6 +10,7 @@
 # 0.6.3.0
 
 ## Refactor
+* Increase the spacing above and below post contents [#7267](https://github.com/diaspora/diaspora/pull/7267)
 
 ## Bug fixes
 * Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)

app/assets/stylesheets/stream_element.scss

@@ -96,7 +96,17 @@
       font-size: $font-size-small;
       line-height: $font-size-small;
     }
-    .post-content p:last-of-type { margin-bottom: 0; }
+
+    .post-content {
+      .markdown-content {
+        padding: .8em 0 .4em;
+      }
+
+      p:last-of-type {
+        margin-bottom: 0;
+      }
+    }
+
     .nsfw-shield {
       color: $text-grey;
       padding: 5px 10px;

config/diaspora.yml.example

@@ -249,7 +249,7 @@ configuration: ## Section
         ## Configure the protocol used to access the BOSH endpoint
         #proto: http
 
-        ## Configure the address that vines should listen on.
+        ## Configure the address that prosody should listen on.
         #address: '0.0.0.0'
 
         ## Configure the BOSH port.