Merge branch 'series-grid' into vnext

Conflicts:
	UI/Config.js
This commit is contained in:
Mark McDowall
2013-04-09 20:17:41 -07:00
parent d81e0885c3
commit 35e2e83595
12 changed files with 157 additions and 19 deletions
+2
View File
@@ -69,4 +69,6 @@
.img-polaroid {
min-width: 138px;
min-height: 203px;
max-width: 138px;
max-height: 203px;
}