Oswaldo Acauan d1f2614d00 Fix merge conflicts		2016-07-05 16:50:14 +00:00
..
methods	fixes html5 clinet logout and nav-bar	2016-06-28 15:30:43 -04:00
modifiers	Fix merge conflicts	2016-07-05 16:50:14 +00:00
publications.js	Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging	2016-05-16 19:54:51 +00:00