Merge branch 'master' into alpha38

This commit is contained in:
Adam Bradley
2015-10-07 16:47:23 -05:00

View File

@ -68,3 +68,7 @@ ion-scroll {
.demo-slide-3 {
background-color: #f53d3d;
}
scroll-content {
overflow-y: hidden;
}