diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-05 16:13:42 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-05 16:13:42 -0700 |
| commit | 03a833f2f8a1d68decc2c7ef85ddfff087ea4254 (patch) | |
| tree | 6009bd2ef9e8adfa9d4687a48eb17ae35da7e7d8 /version.inc | |
| parent | ea63f3312fc69df6c9e9b55568933a65adafee77 (diff) | |
| parent | efa589300afb8b3c29e6a8b6a5886c444e26ac36 (diff) | |
| download | volse-hubzilla-03a833f2f8a1d68decc2c7ef85ddfff087ea4254.tar.gz volse-hubzilla-03a833f2f8a1d68decc2c7ef85ddfff087ea4254.tar.bz2 volse-hubzilla-03a833f2f8a1d68decc2c7ef85ddfff087ea4254.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
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 ce6a0da88..cab20ff1c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-04.1114 +2015-08-05.1115 |