git-svn-id: http://svn.redmine.org/redmine/trunk@18792 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/4.1.0
@@ -34,7 +34,6 @@ Layout/AlignArguments: | |||
# Cop supports --auto-correct. | |||
Layout/AlignArray: | |||
Exclude: | |||
- 'app/models/setting.rb' | |||
- 'lib/redmine/default_data/loader.rb' | |||
# Cop supports --auto-correct. |
@@ -43,7 +43,7 @@ class Setting < ActiveRecord::Base | |||
'%I:%M %p' | |||
] | |||
ENCODINGS = %w(US-ASCII | |||
ENCODINGS = %w(US-ASCII | |||
windows-1250 | |||
windows-1251 | |||
windows-1252 |