|
Marc
|
dff950162cd4d79d5e199e833e46a98d381397dc
dff950162cd4d79d5e199e833e46a98d381397dc |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/phpbb/db/migration/tool/module.php |
|
|
Marc
|
f008708d5cebfea7ef6efef4c876e99f819bff71
m f008708d5cebfea7ef6efef4c876e99f819bff71 |
Merge pull request #4377 from rxu/ticket/14703
[ticket/14703] Fix parent module selection for custom extension modules |
|
|
rxu
|
557f85e7fc3dc299859e846a8f406f0e19aaf465
m 557f85e7fc3dc299859e846a8f406f0e19aaf465 |
[ticket/14703] Improve exception testing
PHPBB3-14703 |
|
|
rxu
|
8e8e25cc1f4f443f6ff945336f534217a5e4339e
m 8e8e25cc1f4f443f6ff945336f534217a5e4339e |
[ticket/14703] Fix the docblock
PHPBB3-14703 |
|
|
rxu
|
5eb493fa86249d865eefe4886b187cf271ffd989
m 5eb493fa86249d865eefe4886b187cf271ffd989 |
[ticket/14703] Fix existance checking if multiple parent module_langname found
PHPBB3-14703 |
|