diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-16 13:44:23 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-16 13:44:23 +0100 |
commit | 983e170f20cfafadab7fb74bf5ca5b56e54205db (patch) | |
tree | 25b39449dcbf0636b5519c3beac2ec70b04510c1 /version.inc | |
parent | 72353bf0446901f1711cba7a2e50dbce9bd06227 (diff) | |
parent | f66c6bfebfd48274c9b29cd62b1fac933c6530e4 (diff) | |
download | volse-hubzilla-983e170f20cfafadab7fb74bf5ca5b56e54205db.tar.gz volse-hubzilla-983e170f20cfafadab7fb74bf5ca5b56e54205db.tar.bz2 volse-hubzilla-983e170f20cfafadab7fb74bf5ca5b56e54205db.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 a2d8d6da6..e854f1c97 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-13.1277H +2016-01-15.1279H |