Anton Georgiev a1d4e62d9b Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15 ... Conflicts: labs/meteor-client/app/client/stylesheets/portrait/chat.less		2015-02-06 20:03:11 +00:00
..
app	Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15	2015-02-06 20:03:11 +00:00
log	(not complete) on meteor 1.0	2014-11-12 16:04:03 -05:00
.gitignore	moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor	2014-10-02 16:16:34 +00:00
grunt-instructions.txt	grunt materials	2014-10-02 17:14:41 +00:00
Gruntfile.js	fix path to files	2014-10-02 18:23:10 +00:00
package.json	grunt materials	2014-10-02 17:14:41 +00:00