Oleksandr Zhurbenko 933ffe102f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui ... Conflicts: bigbluebutton-html5/app/client/views/chat/chat_bar.coffee		2015-05-24 20:32:13 -07:00
..
.meteor	Added foundation icons package	2015-05-06 09:07:40 -07:00
client	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui	2015-05-24 20:32:13 -07:00
collections	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
lib	prevent redirect to <ip>/undefined	2015-05-07 16:35:13 +00:00
public/packages/ionicons/fonts	update the ionicon ttf and woff	2015-04-16 13:51:59 +00:00
server	Merge pull request #635 from perroned/bridge-construction	2015-05-07 11:42:08 -04:00
tests	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
config.coffee	we still need the bbb build num	2015-05-07 20:20:51 +00:00
packages.json	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
smart.json	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
smart.lock	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
start.sh	Update start.sh	2015-03-05 16:52:04 -05:00