Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/1.7' into 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
rgrebenchuk committed Sep 28, 2015
2 parents bb0d6cb + d918dbb commit 29e2174
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/OroCRM/Bundle/MagentoBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -860,8 +860,8 @@ datagrid:
options:
field_options:
choices:
false: orocrm.magento.datagrid.columns.order_is_guest.no
true: orocrm.magento.datagrid.columns.order_is_guest.yes
'false': orocrm.magento.datagrid.columns.order_is_guest.no
'true': orocrm.magento.datagrid.columns.order_is_guest.yes
data_name: o.isGuest
createdAt:
type: datetime
Expand Down

0 comments on commit 29e2174

Please sign in to comment.