| commit | c0c77cd20b23921c9e893bb70b99f38be153875a | |
| author | Andreas Gohr <gohr@cosmocode.de> | |
| Thu, 10 Oct 2019 07:22:24 +0000 (10 09:22 +0200) | ||
| committer | Andreas Gohr <gohr@cosmocode.de> | |
| Thu, 10 Oct 2019 07:22:24 +0000 (10 09:22 +0200) | ||
| tree | dd64ab8f00e290045e4a4a56e6f4cfe0c99d23ee | treesnapshot (tar.gz zip) |
| parent | 42c62e557b443e27796171b5bedd777d77472586 | commitdiff |
| parent | 8b0f0c74f83b2d266fa30e1362b6322bb5fb3547 | commitdiff |
Merge branch 'master' into psr2
changes from commit b15f23f6735eabb6dc7e4a996e4ae164139ab7f5 may have
been lost, because the code changed to much.
changes from commit df81ca99eeaf4753d6f09cbddbb529afe7ef71c7 need to be
verified. we might need to do some more adjustments.
* master: (49 commits)
translation update
translation update
translation update
translation update
translation update
translation update
translation update
Update config.class.php
translation update
translation update
Update lang.php
Add ugc hint to nofollow
add UGC hint
translation update
translation update
use a script to fetch the correct phpunit
Revert "output travis php version for easier debugging"
setup databases for unit tests in travis
output travis php version for easier debugging
translation update
...
changes from commit b15f23f6735eabb6dc7e4a996e4ae164139ab7f5 may have
been lost, because the code changed to much.
changes from commit df81ca99eeaf4753d6f09cbddbb529afe7ef71c7 need to be
verified. we might need to do some more adjustments.
* master: (49 commits)
translation update
translation update
translation update
translation update
translation update
translation update
translation update
Update config.class.php
translation update
translation update
Update lang.php
Add ugc hint to nofollow
add UGC hint
translation update
translation update
use a script to fetch the correct phpunit
Revert "output travis php version for easier debugging"
setup databases for unit tests in travis
output travis php version for easier debugging
translation update
...