src/i18n/openfire_i18n_en.properties · de98467faa61d6eebf6ac258399153d4d6feb763 · Administrator / Openfire · GitLab

Blame History Permalink

Merge remote-tracking branch 'upstream/master' into refactor-connectionmanagement · 2ea7e588
Guus der Kinderen authored Dec 01, 2015
```
Conflicts:
	src/i18n/openfire_i18n_en.properties
	src/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
```
2ea7e588

openfire_i18n_en.properties 173 KB

Technounit-GROUP 2023