diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:07:50 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:07:50 +0100 |
| commit | f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961 (patch) | |
| tree | ddb343611d4595194c1daa2f75ce630fb249b462 /phpBB/includes/acp/acp_update.php | |
| parent | 3dfc882d1a83b1b2e3769d6530c8d351e3c86e40 (diff) | |
| parent | dcadfe092c16b539121d2118169419ed01a6cc2c (diff) | |
| download | forums-f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961.tar forums-f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961.tar.gz forums-f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961.tar.bz2 forums-f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961.tar.xz forums-f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15006] Pass inherit settings to form and use correct button
Diffstat (limited to 'phpBB/includes/acp/acp_update.php')
0 files changed, 0 insertions, 0 deletions