Merge branch 'master' of https://github.com/friendica/red

2014-02-06 14:54:23 +01:00 · 2014-02-06 14:54:23 +01:00 · c26ae94592
commit c26ae94592
parent d1bd6cdb25 7a522be20b
2 changed files with 2 additions and 1 deletions
--- a/assets/home.html
+++ b/assets/home.html
@ -39,6 +39,7 @@ header { z-index: 10000; }
 <div class="td">Blogging</div>
 <div class="td">Decent Encryption</div>
 <div class="td">Chatrooms</div>
+<div class="td">Unsend Private Mail</div>
 <div class="td">Webpage Creation</div>
 <div class="td">Content Management</div>
 <div class="td">Games</div>
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2014-02-05.579
+2014-02-06.580