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

- Allow download of conflicting file for later reference in automatic updater

Browse Source 
- Default difference view is now 'inline' instead of 'side by side'
- Added new option for merging differences to conflicting files in automatic updater


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9252 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-01-12 16:58:47 +00:00
parent 507d8b0385
commit 189e7cdf45
6 changed files with 231 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/diff/renderer.php
View File

@@ -857,4 +857,4 @@ class diff_renderer_side_by_side extends diff_renderer
}
?>
?>