Conflicts: config/initializers/gettext_rails_i18n_patch.rb
Attach a file by drag & drop or click to upload
