aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-07 19:24:36 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-07 19:24:36 +0200
commit3f9e39a9e3d72681056475fe60b193ef78caf536 (patch)
tree0fe9c6bcbcc48ccbcceb0a31a95c10fae7207f28 /version.inc
parentb51bcba26398a90f9d29d7ced2615a88040a6aac (diff)
parent862bfbdd2bc60b201918d02351f2591ccf5aea04 (diff)
downloadvolse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.tar.gz
volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.tar.bz2
volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.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 39bb632b7..fe5a631ad 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-03.1082
+2015-07-06.1085