diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-19 11:35:31 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-19 11:35:31 +0200 |
commit | 5a7e8d8520601b3c08ef15c520da19d05b31d23b (patch) | |
tree | d6f91b9982f80d7db26beb8be953ca8f3325af85 /version.inc | |
parent | 1bd1050160efd88483a50c3a2a239e2160048924 (diff) | |
parent | 63146821d7f28107ca34fbe581dcc3abf6fd49fe (diff) | |
download | volse-hubzilla-5a7e8d8520601b3c08ef15c520da19d05b31d23b.tar.gz volse-hubzilla-5a7e8d8520601b3c08ef15c520da19d05b31d23b.tar.bz2 volse-hubzilla-5a7e8d8520601b3c08ef15c520da19d05b31d23b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'version.inc')
-rw-r--r-- | version.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc index e008faecc..2d7153d51 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-16.1157 +2015-09-18.1159 |