-
André Berenguel authored
Conflicts: src/java/org/jivesoftware/openfire/keystore/IdentityStore.java
e08055a5
| Name |
Last commit
|
Last update |
|---|---|---|
| build | ||
| documentation | ||
| src | ||
| .gitignore | ||
| .travis.yml | ||
| Makefile | ||
| README.md |
Conflicts: src/java/org/jivesoftware/openfire/keystore/IdentityStore.java
| Name |
Last commit
|
Last update |
|---|---|---|
| build | ||
| documentation | ||
| src | ||
| .gitignore | ||
| .travis.yml | ||
| Makefile | ||
| README.md |