diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:42:28 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:42:28 +0200 |
| commit | f4bc0020ca6c4194d60c7f81dbb8be136e1b222c (patch) | |
| tree | f25af1bc498627ee5c01c2e0fc11eec4d5b426c3 /phpBB/phpbb/install/module/install_database/module.php | |
| parent | e0ae49d8a5cda64744c8e08317a5c5329deb2472 (diff) | |
| parent | 67995e1e096d44069d3c76efc5c7ab90aef73398 (diff) | |
| download | forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar.gz forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar.bz2 forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar.xz forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15174] Split timeout message to extra method and set timeout to 60s
[ticket/15174] Increase timeout for loading indicator
Diffstat (limited to 'phpBB/phpbb/install/module/install_database/module.php')
0 files changed, 0 insertions, 0 deletions