Merge branch 'master' into notes

Conflicts: Gemfile.lock app/assets/stylesheets/common.css.scss app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml
2013-01-15 21:11:35 +00:00 · 2013-01-15 21:11:35 +00:00 · 3d7eb387a7
commit 3d7eb387a7
parent ee530d8111 f111e6c1cf
191 changed files with 4986 additions and 2256 deletions
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@ -30,6 +30,7 @@ module Potlatch2
    "ja" => "ja_JP",
    "ka" => "ka",
    "ko" => "ko",
+    "ky" => "ky",
    "lb" => "lb",
    "lt" => "lt",
    "lv" => "lv",