diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-12 19:00:54 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-12 19:00:54 -0700 |
| commit | 018e7022817fd73e904021ecf46f2c5839da9a62 (patch) | |
| tree | 0bc817910756931bcaa0b773d30d31ee3c8fa6ed /version.inc | |
| parent | 5386686a1e0e60623d6421cbd85a93814c74fb58 (diff) | |
| parent | 1e0e812440b8b87c39a88692e39eb0baca736b6e (diff) | |
| download | volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.tar.gz volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.tar.bz2 volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/nl/strings.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 387119390..574787527 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-10.1028 +2015-05-12.1030 |