-
Jonny Bradley authored
Conflicts: lang/de/language.php and lang/pt-br/language.php resolved using "mine full" lib/setup/twversion.class.php and lib/setup/perms.php fixed manually
0891c624
Conflicts: lang/de/language.php and lang/pt-br/language.php resolved using "mine full" lib/setup/twversion.class.php and lib/setup/perms.php fixed manually