Merge branch 'staging' into framework

This commit is contained in:
Caleb James DeLisle
2017-10-06 14:50:35 +03:00
27 changed files with 3411 additions and 955 deletions

View File

@@ -31,6 +31,6 @@ body.cp-app-slide { @import "../../../slide/app-slide.less"; }
body.cp-app-file { @import "../../../file/app-file.less"; }
body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
body.cp-app-contacts { @import "../../../contacts/app-contacts.less"; }
//body.cp-app-poll { @import "../../../poll/app-poll.less"; }
body.cp-app-poll { @import "../../../poll/app-poll.less"; }
body.cp-app-whiteboard { @import "../../../whiteboard/app-whiteboard.less"; }