diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-05 11:26:07 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-05 11:26:07 +0100 |
| commit | 7119976199f0c2cd4766a073609e6c76bdc9c30f (patch) | |
| tree | aa3f6a6bcbb96849670efad7d8a1d8e2fb972511 /version.inc | |
| parent | dd7edc8ced15be66ebf830baaf8f909d16457d46 (diff) | |
| parent | 4428f70ea292f1800ffde39ea49732628e83f862 (diff) | |
| download | volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.tar.gz volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.tar.bz2 volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.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 71564ad0d..8282941e1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-12-02.1234 +2015-12-03.1235 |