diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-13 15:02:51 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-13 15:02:51 -0700 |
| commit | 3f0009ccd7fb96e8808b3267367ae95ffee37161 (patch) | |
| tree | 560fdc784069b6cf07af82d1f612e64dacca9390 /version.inc | |
| parent | e838647e3aa87c36a494375c502e98788f209d19 (diff) | |
| parent | 8c4c0246f012a57816ebf3f8bef9510f4e89e98f (diff) | |
| download | volse-hubzilla-3f0009ccd7fb96e8808b3267367ae95ffee37161.tar.gz volse-hubzilla-3f0009ccd7fb96e8808b3267367ae95ffee37161.tar.bz2 volse-hubzilla-3f0009ccd7fb96e8808b3267367ae95ffee37161.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
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 aa34c32c5..2a5419bb9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-11.1060 +2015-06-13.1062 |