Mark McDowall 35e2e83595 Merge branch 'series-grid' into vnext ...

Conflicts:
	UI/Config.js

2013-04-09 20:17:41 -07:00

..

.idea

removed old references to AddSeries/SearchResultModel, AddSeries/SearchResultCollection

2013-04-09 17:46:42 -07:00

AddSeries

Merge branch 'series-grid' into vnext

2013-04-09 20:17:41 -07:00

Calendar

…

Content

…

JsLibraries

…

Missing

…

Mixins

…

Quality

…

Series

Merge branch 'series-grid' into vnext

2013-04-09 20:17:41 -07:00

Settings

…

Shared

…

Upcoming

…

app.js

…

Config.js

Merge branch 'series-grid' into vnext

2013-04-09 20:17:41 -07:00

Controller.js

…

favicon.ico

…

HeaderView.js

…

Index.html

Merge branch 'series-grid' into vnext

2013-04-09 20:17:41 -07:00

MainMenuView.js

…

Routing.js

…