]> source.dussan.org Git - sonarqube.git/commit
Fix conflict of Java web services with RoR development mode
authorSimon Brandhof <simon.brandhof@gmail.com>
Wed, 22 Jan 2014 09:28:42 +0000 (10:28 +0100)
committerSimon Brandhof <simon.brandhof@gmail.com>
Wed, 22 Jan 2014 09:28:54 +0000 (10:28 +0100)
commit54e5359b2fcc258d2b7b4b1ec8f399ea4d9a3ff7
tree5cfbe076351b521d796b739b93d106424c8310a7
parent0285e6af2ea839968a3121afbbdf8c1e0e08fac1
Fix conflict of Java web services with RoR development mode
sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java
sonar-server/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb
sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/base.rb
sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb