mirror of https://codeberg.org/Mercury-IM/Smack
001985647a
This also fixes a errornous merge where the same branch with different commit was merged into master and 4.4 The conflicting commits are 4.4: |
||
---|---|---|
.. | ||
form | ||
packet | ||
provider | ||
AbstractMultiFormField.java | ||
AbstractSingleStringValueFormField.java | ||
BooleanFormField.java | ||
FormField.java | ||
FormFieldChildElement.java | ||
FormFieldWithOptions.java | ||
JidMultiFormField.java | ||
JidSingleFormField.java | ||
ListMultiFormField.java | ||
ListSingleFormField.java | ||
SingleValueFormField.java | ||
TextMultiFormField.java | ||
TextSingleFormField.java | ||
XDataManager.java | ||
package-info.java |