mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ticket/10734

Browse Source 
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Shibu Lijack
2012-04-10 21:46:14 +05:30
parent daee253403 41e03164c1
commit fd55c8664a
125 changed files with 3795 additions and 5220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/styles/prosilver/template/overall_header.html
View File

@@ -22,10 +22,6 @@
Based on style: prosilver (this is the default phpBB3 style)
Original author: Tom Beddard ( http://www.subBlue.com/ )
Modified by:
NOTE: This page was generated by phpBB, the free open-source bulletin board package.
The phpBB Group is not responsible for the content of this page and forum. For more information
about phpBB please visit http://www.phpbb.com
-->
<script type="text/javascript">