Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: spec/features/admin/translations_spec.rb
- Loading branch information
Conflicts: spec/features/admin/translations_spec.rb