-
Jonny Bradley authored
Conflicts on db/tiki.sql, lib/setup/prefs.php & lib/prefs/payment.php by using trunk versions Manual fixes for new regime to come
9eedda0f
Conflicts on db/tiki.sql, lib/setup/prefs.php & lib/prefs/payment.php by using trunk versions Manual fixes for new regime to come