bigbluebutton-Github/bigbluebutton-web
Lucas Zawacki 7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2014-11-14 15:33:17 -02:00
..
.settings
grails-app Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 2014-11-14 15:33:17 -02:00
lib - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
src Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 2014-11-14 15:33:17 -02:00
test - cleanup. We'll have to re-implement these tests 2014-07-30 14:26:39 -07:00
web-app - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
wrapper - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
.classpath - modify lib path 2014-10-22 02:44:15 -07:00
.gitignore - merge some new stuff 2012-07-29 16:06:39 +00:00
application.properties After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
build.gradle - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
COPYING.LESSER - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw.bat - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
INSTALL - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00