]> source.dussan.org Git - sonarqube.git/commit
Fix merge
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Tue, 6 Sep 2016 08:50:11 +0000 (10:50 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Tue, 6 Sep 2016 08:50:11 +0000 (10:50 +0200)
commit8381ab5fc298ed1413890e85f81e4122379294b1
treec135b9f1ba538d6b3067cefaa23bcafea49e32bc
parentebc43c59ac25a3c75b9ce089f90e9eaac6c74637
Fix merge
server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java
server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java
server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java