Merge remote-tracking branch 'origin/MAGETWO-51516' into MAGETWO-51824

NadiyaS · NadiyaS · commit daacad9da492 · 2016-04-14T13:23:17.000+03:00
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
@@ -394,7 +394,7 @@
                         'yy': 'yy' // Always long year format on frontend
                     },
                     time: {
-                        'a': 'tt',
+                        'a': 'TT',
                         'HH': 'hh',
                         'H': 'h'
                     }

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@`
`394`	`394`	`'yy': 'yy' // Always long year format on frontend`
`395`	`395`	`},`
`396`	`396`	`time: {`
`397`		`- 'a': 'tt',`
	`397`	`+ 'a': 'TT',`
`398`	`398`	`'HH': 'hh',`
`399`	`399`	`'H': 'h'`
`400`	`400`	`}`