-
Guus der Kinderen authored
Conflicts: src/i18n/openfire_i18n_en.properties src/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
2ea7e588
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| apache/mina/management | ||
| dom4j/io | ||
| jivesoftware |
Conflicts: src/i18n/openfire_i18n_en.properties src/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| apache/mina/management | ||
| dom4j/io | ||
| jivesoftware |