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

4
app/views/layouts/application.html.erb
View File

@@ -33,9 +33,9 @@
<p>
<%= t("layouts.application.ie",
chrome: link_to(
t("layouts.application.chrome"), "https://www.google.com/chrome/browser/desktop/", target: "_blank"),
t("layouts.application.chrome"), "https://www.google.com/chrome/browser/desktop/", title: t("shared.target_blank_html"), target: "_blank"),
firefox: link_to(
t("layouts.application.firefox"), "https://www.mozilla.org/firefox", target: "_blank")
t("layouts.application.firefox"), "https://www.mozilla.org/firefox", title: t("shared.target_blank_html"), target: "_blank")
).html_safe %>
</p>
</div>