Merge branch 'v3.1.0rc1-branch' into asonix/downstream
This commit is contained in:
commit
8f40a2a7f8
|
@ -129,13 +129,12 @@ class UserSettingsDecorator
|
|||
boolean_cast_setting 'setting_trends'
|
||||
end
|
||||
|
||||
<<<<<<< HEAD
|
||||
def crop_images_preference
|
||||
boolean_cast_setting 'setting_crop_images'
|
||||
=======
|
||||
def strip_formatting_preference
|
||||
settings['setting_strip_formatting']
|
||||
>>>>>>> asonix/changes
|
||||
end
|
||||
|
||||
def crop_images_preference
|
||||
boolean_cast_setting 'setting_crop_images'
|
||||
end
|
||||
|
||||
def boolean_cast_setting(key)
|
||||
|
|
Loading…
Reference in a new issue