perroned 642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton ... Conflicts: bigbluebutton-html5/imports/ui/components/app/AppService.js		2016-05-13 14:54:19 -05:00
..
components	Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton	2016-05-13 14:54:19 -05:00
services/api	Cleans lint	2016-05-13 11:31:06 -05:00
stylesheets/variables	Add i18n, modular layouts and basic styles	2016-05-03 17:40:46 -03:00