makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/styles
History
Marc Alexander 450e5b36b8 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2016-06-19 18:07:29 +02:00
..
all/template [ticket/13645] Move the feeds to controllers 2015-08-23 22:36:10 +02:00
prosilver Merge branch '3.1.x' into 3.2.x 2016-06-19 18:07:29 +02:00