Maxim Khlobystov 8256f78db1 Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-viewer ... Conflicts: labs/meteor-client/app/.meteor/packages labs/meteor-client/app/.meteor/versions labs/meteor-client/app/client/main.coffee labs/meteor-client/app/client/stylesheets/style.css		2014-11-24 13:08:44 -08:00
..
chat.less	Merge branch 'meteor-style-changes' of github.com:antobinary/bigbluebutton into testing-version-005	2014-11-10 20:36:50 -05:00
style.css	Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-viewer	2014-11-24 13:08:44 -08:00
users.less	Fix CSS/LESS conflicts, simplified, and organized code.	2014-10-28 06:06:38 -07:00
whiteboard.less	I don't think this is needed. Causes paper to escape whiteboard template.	2014-11-04 07:38:04 -08:00