aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-06 14:56:59 +0100
committermarijus <mario@localhost.localdomain>2014-02-06 14:56:59 +0100
commita2b311991a90e1c78d30bad5504c18bb2a3c5c2a (patch)
tree54b5e5dbc7230442a3e1ec894c4a4c385b2d78c7 /version.inc
parent419e3b5024efec40c98e48c3bf213c4e60d39fae (diff)
parent7a522be20bd66a0a904dcddf33d53e59aa04a92d (diff)
downloadvolse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.gz
volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.bz2
volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.zip
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
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