Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Tiki Wiki CMS Groupware
Tiki
Repository
tiki
lib
setup
prefs.php
Find file
Blame
History
Permalink
[MRG] Automatic merge, trunk 61665 to 61690
· 7acb04a2
Jonny Bradley
authored
Mar 14, 2017
Conflicts fixed on lib/setup/prefs.php and property conflict fixed on templates
7acb04a2