diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-15 16:02:37 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-15 16:02:37 -0700 |
| commit | 7517c76ae48ddad741fe61c41dd6dcc09421d160 (patch) | |
| tree | e4030f6419432e8644a4897a38703559a4ba1889 /version.inc | |
| parent | bf5a1f662a4f00e8376613fa387c843d539c7433 (diff) | |
| parent | e26f771cbe5717f9db9c5dde897f1f6e79b3a932 (diff) | |
| download | volse-hubzilla-7517c76ae48ddad741fe61c41dd6dcc09421d160.tar.gz volse-hubzilla-7517c76ae48ddad741fe61c41dd6dcc09421d160.tar.bz2 volse-hubzilla-7517c76ae48ddad741fe61c41dd6dcc09421d160.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
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 b94d740a1..f103ff89c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-10-14.1185 +2015-10-15.1186 |