git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7169b1 9bc4fa2)
Merge branch 'develop' into bug/JAL-4235_gradle_task_jalviewjsTranspile_does_not_fail...
authorJames Procter <j.procter@dundee.ac.uk>
Thu, 2 Nov 2023 17:24:50 +0000 (17:24 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Thu, 2 Nov 2023 17:24:50 +0000 (17:24 +0000)
1  2 
build.gradle patch | diff1 | diff2 | blob | history
gradle.properties patch | diff1 | diff2 | blob | history

diff --cc build.gradle
Simple merge
diff --cc gradle.properties
Simple merge