JAL-3066 remove git conflict file
[jalview.git] / src / swingjs / api /
2022-11-28 Jim ProcterMerge branch 'develop' into merged_2_11_2_0_to_2_12
2022-03-08 Jim ProcterJAL-3438 spotless for 2.11.2.0
2020-06-30 gmungocJAL-3446 unused imports removed
2020-06-07 BobHansonJAL-3446 JavaScript interface
2020-06-05 BobHansonRefactoring of Jalview, JalviewAppLoader, JalviewApp...
2020-06-01 BobHansonSwingJS update
2020-06-01 BobHansonswingjs/api, javajs/async
2020-04-08 BobHansonJAL-3253 merge of new SwingJS api