Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 70013617399360b9d353678110106682a864765d..ad7780013a59a9e474b2570638a0fc8f1fd9227b 100644 (file)
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -3,9 +3,10 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark, Friendica theme
- * Version: 0.9
+ * Version: 1.0
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.png">screenshot</a>
  */
 
 

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 26e07b1f76b81692fb222c42c176ed20316628a4..e3f8f5b4570d7a2c6c2d0566c6c2509dee9a3f56 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Dispy
  * Description: Dispy, Friendica theme
- * Version: 0.9
+ * Version: 1.0
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
  */