diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-03 18:14:52 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-03 18:14:52 +0100 |
| commit | c363fc71eb054ffa615bdfe03c645a9ab946379e (patch) | |
| tree | 564dbaa2dac8bb13260704730a8e5483084baa67 /version.inc | |
| parent | b96f09bb3aeee403038755ab5f6e6b53654cb145 (diff) | |
| parent | 9f3ea71d5d9e1e42d1d1e44a8070d90814962ad2 (diff) | |
| download | volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.gz volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.bz2 volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.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 936c9fe07..71564ad0d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-30.1232 +2015-12-02.1234 |