diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-06 14:54:23 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-06 14:54:23 +0100 |
| commit | c26ae94592dda51a40903ea65f117fd7dd9d0ef3 (patch) | |
| tree | 54b5e5dbc7230442a3e1ec894c4a4c385b2d78c7 | |
| parent | d1bd6cdb25108e78173f92b2e11d03b617653ac8 (diff) | |
| parent | 7a522be20bd66a0a904dcddf33d53e59aa04a92d (diff) | |
| download | volse-hubzilla-c26ae94592dda51a40903ea65f117fd7dd9d0ef3.tar.gz volse-hubzilla-c26ae94592dda51a40903ea65f117fd7dd9d0ef3.tar.bz2 volse-hubzilla-c26ae94592dda51a40903ea65f117fd7dd9d0ef3.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | assets/home.html | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/assets/home.html b/assets/home.html index 975896c0c..1a0a13481 100644 --- 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> diff --git a/version.inc b/version.inc index c26fe7d69..424737526 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-02-05.579 +2014-02-06.580 |