diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-05-27 19:27:38 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-27 19:27:38 -0700 |
commit | b381ec57346a6d7724b2317c120ce2e6e70edc37 (patch) | |
tree | e2cf66e01a87e438241e5bfac5daf6e7d3046b71 /version.inc | |
parent | 675aa96f222877a5aa543b8409a2c580cf10d3aa (diff) | |
parent | 11301d51a58d04843ba3056b4c9e92d59ced1334 (diff) | |
download | volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.tar.gz volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.tar.bz2 volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/impel.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 20fd10ffb..2dbf2a1b8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-25.1043 +2015-05-27.1045 |