Anton Georgiev 623136670a Merge branch 'merge-with-tests' of github.com:lfzawacki/bigbluebutton into merge-with-tests ... Conflicts: labs/meteor-client/app/.meteor/packages		2014-11-12 16:00:44 -05:00
..
app	Merge branch 'merge-with-tests' of github.com:lfzawacki/bigbluebutton into merge-with-tests	2014-11-12 16:00:44 -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