aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-14 18:14:30 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-14 18:14:30 +0100
commit72353bf0446901f1711cba7a2e50dbce9bd06227 (patch)
tree6b73f79bf7386e69e4941ff5a8b4c165830b1652 /version.inc
parent42433c0b4442f1a6b451324fe7f765b1b4c354b8 (diff)
parent9f9fdc1434b7283171f8d843f225228cdb322115 (diff)
downloadvolse-hubzilla-72353bf0446901f1711cba7a2e50dbce9bd06227.tar.gz
volse-hubzilla-72353bf0446901f1711cba7a2e50dbce9bd06227.tar.bz2
volse-hubzilla-72353bf0446901f1711cba7a2e50dbce9bd06227.zip
Merge remote-tracking branch 'upstream/master'
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 3641bf5e9..a2d8d6da6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-10.1274H
+2016-01-13.1277H