diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
| commit | 477e08f1d6726809660e4841f389493541f7bc07 (patch) | |
| tree | 785b12b53c5e46e317def1768558f33445ab2b1f /tests/travis/mysql.phpunit.xml | |
| parent | 2342256c076502cbaca86fcff2a1dbbfc49a1900 (diff) | |
| parent | 39967987ebcc79fc867c1f7fa8d69cc65801f594 (diff) | |
Merge branch '3.0-stable' into develop
Fixed conflicts:
user_guide_src/source/overview/at_a_glance.rst
Diffstat (limited to 'tests/travis/mysql.phpunit.xml')
0 files changed, 0 insertions, 0 deletions