* crizz0/ticket/9758:
[ticket/9758] Clickable avatar in header and renamed class for avatar-img
[ticket/9758] Remove unnessary if-question for include functions_display
[ticket/9758] Slims the line 4775 in includes/functions.php
[ticket/9758] Adds id and changes filter to fix travis CI test
[ticket/9758] Removed the needless space after first ENDIF
[ticket/9758] Adding impr. for overall_header display of avatar and username
[ticket/9758] Fixed bug in mcp_warn.php
[ticket/9758] Optimises the html code of avatar image in header
[ticket/9758] Error because of missing functions_display.php fixed
[ticket/9758] Removed useless if-conditions to include functions.php
[ticket/9758] Changes class name of new "span" in overall_header.html
[ticket/9758] Adds global template variable CURRENT_USER_AVATAR
The resize element displays a mechanism for allowing the
user to resize the element. Setting this to vertical means it
may only be resized vertically.
PHPBB3-11111
* crizz0/ticket/8785:
[ticket/8785] Deletes additional add and add_bcc buttons
[ticket/8785] Fixed problem with add empty.png and travis will now pass
[ticket/8785] and again a fresh line
[ticket/8785] Just one blank line
[ticket/8785] pm_layout.html back to more standard code
[ticket/8785] <hr /> will only displayed when needed
[ticket/8785] Adds blank lines at file end
[ticket/8785] Adds a new optical improvement, new file and fixes html bugs
[ticket/8785] Adds two <hr /> to seperate recipients and BCC
[ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
[ticket/8785] Little spaces mistake
[ticket/8785] Rebuilding posting_editor pm head + new language vars
* 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
