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

Conflict resolution again oops

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9420 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith
2009-03-31 12:41:48 +00:00
parent 193396e9d0
commit bc1ee36ed3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View File

@@ -878,4 +878,4 @@
</div> </div>
</body> </body>
</html> </html>