1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Meik Sievertsen d1f796bf25 phpBB updater now solves common conflicts on it's own. This further reduces the chance of conflicts.
(tested with some heavily modified files who previously generated a lot of conflicts)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10160 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 14:18:57 +00:00
..
2009-09-17 08:13:28 +00:00
2008-08-15 19:46:51 +00:00
2009-07-17 13:23:09 +00:00
2007-10-05 14:30:11 +00:00
2009-06-18 11:04:54 +00:00