diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-09 11:22:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-09 11:22:30 +0200 |
| commit | 3b3f941f5fa5087a3111ddd4603d0f6fa71360ba (patch) | |
| tree | 7b4e98e8f484d0cc28c1cc37341d266ba3da1b58 /phpBB/phpbb/template/twig/node/php.php | |
| parent | d4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff) | |
| parent | 333120a9921d8b36914965540d2d513cb939dc51 (diff) | |
| download | forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.gz forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.bz2 forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.xz forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.zip | |
Merge branch 'ticket/10839-olympus' into ticket/10839
* ticket/10839-olympus:
[ticket/10839] Fix note about running slow tests and build task
[ticket/10839] Removing phpunit.xml.all
[ticket/10839] Always run functional tests by default
Conflicts:
phpunit.xml.dist
Diffstat (limited to 'phpBB/phpbb/template/twig/node/php.php')
0 files changed, 0 insertions, 0 deletions