Skip to content

Commit

Permalink
Merge pull request #935 from magento-engcom/develop-prs
Browse files Browse the repository at this point in the history
Public Pull Requests:
#8910
#8907
#7541
#8808
  • Loading branch information
Oleksii Korshenko authored Mar 17, 2017
2 parents f7a552f + 11faddf commit 5f7064f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ atlassian*
/.grunt
/Gruntfile.js
/package.json
/grunt-config.json
/dev/tools/grunt/configs/local-themes.js

/pub/media/*.*
!/pub/media/.htaccess
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ Minute,Minute
"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
"Report a Bug","Report a Bug"
"Report an Issue","Report an Issue"
"Store View:","Store View:"
"Stores Configuration","Stores Configuration"
"Please confirm scope switching. All data that hasn\'t been saved will be lost.","Please confirm scope switching. All data that hasn\'t been saved will be lost."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

?>
<?php if ($block->getBugreportUrl()): ?>
<a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report a Bug') ?></a>
<a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report an Issue') ?></a>
<?php endif; ?>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface GuestCartItemRepositoryInterface
public function getList($cartId);

/**
* Add the specified item to the specified cart.
* Add/update the specified cart item.
*
* @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item.
* @return \Magento\Quote\Api\Data\CartItemInterface Item.
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Sales/Model/OrderRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
namespace Magento\Sales\Model;

use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
use Magento\Sales\Model\ResourceModel\Order as Resource;
use Magento\Sales\Model\ResourceModel\Metadata;
use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
Expand All @@ -16,7 +15,6 @@
use Magento\Sales\Api\Data\ShippingAssignmentInterface;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\InputException;
use Magento\Framework\Api\SortOrder;

/**
* Repository class for @see OrderInterface
Expand Down

0 comments on commit 5f7064f

Please sign in to comment.