aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-04 06:01:15 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-04 06:01:15 +0100
commit8f810a3dcfd60c00b14d3da811e1c0cf005e8ced (patch)
tree07b801766018c60bd58a476bc60e85671bd70706 /version.inc
parent36ac48779c85ae324d2d702714677e360af5930d (diff)
parent006efbd906980fca8c0c377fa2b0a4054c2849f4 (diff)
downloadvolse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.tar.gz
volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.tar.bz2
volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.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 fa80bc80a..1d1ae17f2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-01.1296H
+2016-02-02.1297H