diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-31 12:01:34 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-31 12:01:34 +0100 |
| commit | 183cd4fdf62f4a03a57d24a8e6306b560fc068dc (patch) | |
| tree | 317982c732e2cff1fac825257adfc97d4f325c74 | |
| parent | d5d22fdbcb8fdede42972de7ab7aee1c5f68b8ce (diff) | |
| parent | e50773a41950de9f8e31030bb5cf84d7f914db16 (diff) | |
Merge branch 'hotfix/0.21.0.1' into rails-3-develop
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | locale/hr/app.po | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 366077795..3c01e26c4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -115,6 +115,7 @@ module Alaveteli 'admin.css', 'ie6.css', 'ie7.css', + 'bootstrap-dropdown.js', 'responsive/print.css', 'responsive/application-lte-ie7.css', 'responsive/application-ie8.css'] diff --git a/locale/hr/app.po b/locale/hr/app.po index e25f68d29..c265712c0 100644 --- a/locale/hr/app.po +++ b/locale/hr/app.po @@ -145,6 +145,7 @@ msgstr "" "\n" "{{user_name}}" + msgid "<a href=\"{{browse_url}}\">Browse all</a> or <a href=\"{{add_url}}\">ask us to add one</a>." msgstr "<a href=\"{{browse_url}}\">Pretražite sve</a> ili <a href=\"{{add_url}}\">zamolite nas da dodamo</a>." |