Merge remote-tracking branch 'origin/BUGS' into BUGS

Sergey Semenov · Sergey Semenov · commit 665571a7475b · 2016-04-20T14:56:30.000+03:00
diff --git a/app/code/Magento/Swatches/etc/config.xml b/app/code/Magento/Swatches/etc/config.xml
@@ -26,4 +26,4 @@
             </watermark>
         </design>
     </default>
-</config>
+</config>
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -871,4 +871,4 @@ define([
             message: data[1]
         };
     });
-});
+});

-Original file line number
+Diff line change
             message: data[1]
         };
     });
 -});
 +});