Conflicts fixed

This commit is contained in:
Matias Pando 2014-09-12 10:24:27 -03:00
commit de43990882
3 changed files with 22 additions and 5 deletions

View file

@ -64,6 +64,7 @@
numbers and symbols</span>" tooltip-trigger="focus"
tooltip-placement="top" required>
<small translate class="is-valid" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.$invalid">Please enter the same password you entered above</small>
<input type="password"
placeholder="{{'Repeat password'|translate}}"
name="joinPasswordConfirm"