aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-03-07 06:00:26 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-03-07 06:00:26 +0100
commit276f44328e4a35993641f249b0a48c1f511f9fa2 (patch)
tree0262b5e55dcee22734ee15224803ab476ec3e62f
parenta1e4940beac7a6f45f54cf296d533352be6d5d77 (diff)
parentda3f1326e024f42e775132df96411da4d1b6705d (diff)
downloadvolse-hubzilla-276f44328e4a35993641f249b0a48c1f511f9fa2.tar.gz
volse-hubzilla-276f44328e4a35993641f249b0a48c1f511f9fa2.tar.bz2
volse-hubzilla-276f44328e4a35993641f249b0a48c1f511f9fa2.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index ca28cf2da..099448bf4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-03-04.1326H
+2016-03-06.1328H