aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-04-16 15:18:31 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-04-16 15:18:31 +0200
commitfddacf0a5aff5146db292f9c90ee5d4d33b06cfe (patch)
tree42f983fcaeeaa3b7358591fb55e5ee2164988247
parentb4205554a8200ae9da3813c449eae3d1e678ecad (diff)
parent65571249b2f25643196b02eaa8913d1a7c146589 (diff)
downloadvolse-hubzilla-fddacf0a5aff5146db292f9c90ee5d4d33b06cfe.tar.gz
volse-hubzilla-fddacf0a5aff5146db292f9c90ee5d4d33b06cfe.tar.bz2
volse-hubzilla-fddacf0a5aff5146db292f9c90ee5d4d33b06cfe.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 e6d5da7c4..352c7a185 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-04-15.1367H
+2016-04-16.1368H