MAGETWO-50681: Merge mainline develop branch and stabilize bamboo builds

slopukhov · slopukhov · commit 1f122c14d51e · 2016-03-21T14:21:23.000+02:00
diff --git a/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php b/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
