consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others

Browse Source 
Conflicts:
	app/assets/javascripts/application.js
This commit is contained in:
palomahnhp
2016-04-20 11:28:06 +02:00
parent 7d4936b577 1e90e37447
commit b4ec077f16
134 changed files with 712 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/verification/sms/edit.html.erb
View File

@@ -19,7 +19,7 @@
</div>
<%= link_to account_path, class: "back" do %>
<i class="icon-angle-left"></i>
<span class="icon-angle-left"></span>
<%= t("verification.back") %>
<% end %>

2
app/views/verification/sms/new.html.erb
View File

@@ -19,7 +19,7 @@
</div>
<%= link_to account_path, class: "back" do %>
<i class="icon-angle-left"></i>
<span class="icon-angle-left"></span>
<%= t("verification.back") %>
<% end %>