[ticket/8041] Merge item name into "Return to" string for better translations
* nickvergessen/ticket/8041:
[ticket/8041] Add space/tabs after => in array list
[ticket/8041] Wrap forum name, topic title and pm folder name with quotes
[ticket/8041] Merge item name into "Return to" string for better translations
* develop-olympus:
[ticket/10549] using correct variable in includes/functions_module.php too
[ticket/10549] changed "right" to "incorrect"
Conflicts:
phpBB/includes/functions_module.php
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
* cyberalien/ticket/11969:
[ticket/11969] Change topic link to unread post in subsilver2
[ticket/11969] Change topic link to unread post in prosilver
[ticket/11969] New language strings for first and last post links
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11662] Typos: occured -> occurred
Conflicts:
tests/template/template_test.php
