Anton Georgiev 783f150442 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging ... Conflicts: bigbluebutton-html5/imports/startup/client/routes.js		2016-05-12 18:08:44 +00:00
..
stylesheets	fix fonts path	2016-05-11 18:30:24 +00:00
main.css	Add i18n, modular layouts and basic styles	2016-05-03 17:40:46 -03:00
main.html	Switch from ion-router to react-router	2016-04-28 15:57:14 -04:00
main.jsx	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging	2016-05-12 18:08:44 +00:00