Felipe Cecagno 015d708d7c Merge branch 'mconf-branding-0.81' into 090-mconf-branding ... Used the following command to comment the default copyright label for all languages except en_US find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g" Conflicts: bigbluebutton-client/resources/prod/MconfLive.html bigbluebutton-client/src/BigBlueButton.mxml record-and-playback/presentation/playback/presentation/playback.html		2014-10-05 19:36:43 -03:00
..
presentation	Merge branch 'mconf-branding-0.81' into 090-mconf-branding	2014-10-05 19:36:43 -03:00