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
vi
language.php
Find file
Blame
History
Permalink
[MRG] Automatic merge, branches/15.x 57917 to 57924
· 25fd4f66
yonixxx
authored
Mar 17, 2016
Conflicts fixed on: modules/mod-func-login_box.php templates/mail/invite_tempuser.tpl
25fd4f66