[ticket/12436] Data passed to sql_multi_insert is expected to be multi-d...
* bantu/ticket/12436:
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
* develop-ascraeus:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
* github-nickvergessen/ticket/11917:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
Conflicts:
phpBB/install/install_install.php
* develop-ascraeus:
[ticket/12201] Decreased pagination font size.
[ticket/12201] Update select element to follow same design as prosilver.
[ticket/12201] Increase sort font size just slightly.
[ticket/12201] Add link to resync file stats after error.
[ticket/12201] Fix typos in language pack.
[ticket/12201] Display error and sorting options when there are no attachments
[ticket/12201] Only the top pagination should be floated to the right.
[ticket/12201] Rearrange pagination, sorting, and submit elements.
[ticket/12201] Center the file size and mark columns.
[ticket/12201] Separate pagination from table.
[ticket/12201] Clean up ACP attachment management page
* prototech/ticket/12201:
[ticket/12201] Decreased pagination font size.
[ticket/12201] Update select element to follow same design as prosilver.
[ticket/12201] Increase sort font size just slightly.
[ticket/12201] Add link to resync file stats after error.
[ticket/12201] Fix typos in language pack.
[ticket/12201] Display error and sorting options when there are no attachments
[ticket/12201] Only the top pagination should be floated to the right.
[ticket/12201] Rearrange pagination, sorting, and submit elements.
[ticket/12201] Center the file size and mark columns.
[ticket/12201] Separate pagination from table.
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
* prototech/ticket/12130:
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
Merge branch 'ticket/12413' into ticket/12413-ascraeus
* ticket/12413:
[ticket/12413] Revert e65a6dd8f4
Conflicts:
phpBB/feed.php
The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.
PHPBB3-12413
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"
This reverts commit e65a6dd8f4, reversing
changes made to 214f515e9c.
PHPBB3-12413
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* Elsensee/ticket/12193:
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* develop-ascraeus:
[ticket/12347] Remove unknown/unnecessary hack
[ticket/12347] IE8 compatible CSS selector
[ticket/12347] Changed from :after to :before
[ticket/12347] Changed to the new navbar templates
