| commit | a967ffa41c5ffc8c6d5142c51a1419d197bac7a3 | [log] [tgz] |
|---|---|---|
| author | Michael Jumper <mjumper@apache.org> | Mon Dec 03 07:30:23 2018 -0800 |
| committer | Michael Jumper <mjumper@apache.org> | Mon Dec 03 07:30:23 2018 -0800 |
| tree | b0acc2a5cf285db8394cc109578d2ff987729156 | |
| parent | 001ece14e2cef413355e3b78161d80af8b7274d2 [diff] | |
| parent | 95dfb5e7657a5685500f18497230ffcb8916b538 [diff] |
GUACAMOLE-670: Merge changes correcting conflicting versions of SLF4J.