makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/styles/prosilver
History
Marc Alexander 1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
2016-03-27 09:59:25 +02:00
..
template Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 2016-03-27 09:59:25 +02:00
theme [ticket/14447] Remove trailing white spaces in Prosilver 2016-02-02 08:42:53 -08:00
style.cfg [ticket/14495] Updates the version to 3.3.0-a1-dev 2016-02-24 22:25:41 +01:00