Luke Pulverenti 7e639dbf67 Merge branch 'dev' ...

Conflicts:
	MediaBrowser.Controller/Entities/BaseItem.cs
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json
	SharedVersion.cs

2016-01-11 21:55:52 -05:00

..

demo

update components

2016-01-08 00:44:45 -05:00

test

merge from dev

2015-12-14 10:43:03 -05:00

.bower.json

Merge branch 'dev'

2016-01-11 21:55:52 -05:00

.gitignore

add new slider

2015-06-26 23:27:38 -04:00

.travis.yml

merge from dev

2015-12-14 10:43:03 -05:00

all-imports.html

add new slider

2015-06-26 23:27:38 -04:00

bower.json

update components

2016-01-08 00:44:45 -05:00

CONTRIBUTING.md

merge from dev

2015-12-14 10:43:03 -05:00

hero.svg

add new slider

2015-06-26 23:27:38 -04:00

index.html

add new slider

2015-06-26 23:27:38 -04:00

paper-input-addon-behavior.html

add new slider

2015-06-26 23:27:38 -04:00

paper-input-behavior.html

update components

2016-01-08 00:44:45 -05:00

paper-input-char-counter.html

merge from dev

2015-12-14 10:43:03 -05:00

paper-input-container.html

update components

2016-01-08 00:44:45 -05:00

paper-input-error.html

merge from dev

2015-12-14 10:43:03 -05:00

paper-input.html

merge from dev

2015-12-14 10:43:03 -05:00

paper-textarea.html

merge from dev

2015-12-14 10:43:03 -05:00