makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View file

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