-
André Berenguel authored
Conflicts: src/java/org/jivesoftware/openfire/keystore/IdentityStore.java
e08055a5
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| apache/mina/management | ||
| dom4j/io | ||
| jivesoftware |
Conflicts: src/java/org/jivesoftware/openfire/keystore/IdentityStore.java
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| apache/mina/management | ||
| dom4j/io | ||
| jivesoftware |