diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-13 16:45:31 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-13 16:45:31 +0100 |
commit | 0178840c19978cf4b0378609df0bcc004c6d36ae (patch) | |
tree | c8a8bcb86661f6278e9e08439c9621638d387d1e /version.inc | |
parent | d04c73ae0000bcd7cf854a936f25583355e78def (diff) | |
parent | 5d0646c9e1f207fa05fd923bcccd9f5844de2664 (diff) | |
download | volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.tar.gz volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.tar.bz2 volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.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 3b6ad6e9a..938250e5c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-11.1213 +2015-11-12.1214 |