aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-03-04 06:05:47 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-03-04 06:05:47 +0100
commit059da4d01705ca1515e0ccf4b790c407c751685c (patch)
treea7f77e3734ba1e53bf7980ff1b6f0c73bc814602 /version.inc
parent264abef81761a3ed0d27126dbc5a6e0a47fb8ec8 (diff)
parenta59d1b22f6ab1bf5b3cf5df555d71b893c05540a (diff)
downloadvolse-hubzilla-059da4d01705ca1515e0ccf4b790c407c751685c.tar.gz
volse-hubzilla-059da4d01705ca1515e0ccf4b790c407c751685c.tar.bz2
volse-hubzilla-059da4d01705ca1515e0ccf4b790c407c751685c.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 9881b9f45..bac770446 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-03-01.1323H
+2016-03-03.1325H