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
lang
gl
language.php
Find file
Blame
History
Permalink
[MRG] Automatic merge, branches/15.x 57626 to 57665
· 86b0f41b
Jonny Bradley
authored
Feb 29, 2016
Conflict fixed in lib/setup/twversion.class.php
86b0f41b