|
Marc
|
45ba2e9770f2f012423bfc2a831771f48357e182
45ba2e9770f2f012423bfc2a831771f48357e182 |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/install/install_install.php
phpBB/language/en/install.php |
|
|
Marc
|
55b854906d31d60f9f3065910a3d1b1ca6d0b6bf
m 55b854906d31d60f9f3065910a3d1b1ca6d0b6bf |
Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick |
|
|
Senky
|
7dc1af25bc2dc0ba59990d53cb7dcdb9c0d48480
m 7dc1af25bc2dc0ba59990d53cb7dcdb9c0d48480 |
[ticket/14654] Change Imagemagick to ImageMagick
PHPBB3-14654 |
|