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
..
components	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging	2016-05-12 18:08:44 +00:00
stylesheets/variables	Add i18n, modular layouts and basic styles	2016-05-03 17:40:46 -03:00