diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-07-21 17:13:48 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-21 17:13:48 -0700 |
commit | c90f14c066d0f289bd2220bb66325db12700aa57 (patch) | |
tree | 6c915ad03936d479d1d807540bbc0e7ae0f854ad /version.inc | |
parent | 24ec104819bbc3778a159ea4790398988a6e2fd7 (diff) | |
parent | 3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff) | |
download | volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.gz volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.bz2 volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/to_do_code.bb
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 249734f42..4b4237878 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-19.1098 +2015-07-21.1100 |