diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-10-01 17:31:22 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-10-01 17:31:22 +0200 |
commit | 2696cf9b9eb84e52532f783cfcab6e4264d53c76 (patch) | |
tree | 7eaa74544a790e18144d9d06f123050775714a93 /version.inc | |
parent | e07ff7d3fbb9bef720831dc71470b70a882abfdf (diff) | |
parent | d9f962ee6ff086da4c7b2d5959802397cb072ef2 (diff) | |
download | volse-hubzilla-2696cf9b9eb84e52532f783cfcab6e4264d53c76.tar.gz volse-hubzilla-2696cf9b9eb84e52532f783cfcab6e4264d53c76.tar.bz2 volse-hubzilla-2696cf9b9eb84e52532f783cfcab6e4264d53c76.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 80d66264c..d3462488c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-28.1169 +2015-09-30.1171 |