diff options
author | Nils Adermann <naderman@naderman.de> | 2011-01-12 03:00:45 +0100 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2011-01-12 03:00:45 +0100 |
commit | bdac86777e1d10f65f8e780f6fbd46ba48d597fe (patch) | |
tree | 7a5e9a81ea1e2390f6b28fe6f321d37aa360e15a /phpBB/docs/coding-guidelines.html | |
parent | a3673789402eae83b94860c87747091125701f78 (diff) | |
parent | 1359cf654714107f752d14a358d76ee310a9ff57 (diff) | |
download | forums-bdac86777e1d10f65f8e780f6fbd46ba48d597fe.tar forums-bdac86777e1d10f65f8e780f6fbd46ba48d597fe.tar.gz forums-bdac86777e1d10f65f8e780f6fbd46ba48d597fe.tar.bz2 forums-bdac86777e1d10f65f8e780f6fbd46ba48d597fe.tar.xz forums-bdac86777e1d10f65f8e780f6fbd46ba48d597fe.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9990] Add docs for running slow tests
[ticket/9990] Integrate utf normalizer tests into test suite
Conflicts:
phpunit.xml.dist
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
0 files changed, 0 insertions, 0 deletions