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
templates
password_jq.tpl
Find file
Blame
History
Permalink
[MRG] Automatic merge, branches/15.x 57431 to 57461
· 237aef76
Jonny Bradley
authored
Feb 05, 2016
Conflict on tiki-change_password.tpl fixed using 15.x version
237aef76