Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
Correction in license of CheckBoxPreferenceWithLongTitle
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
OC-3354: (Fix bug) In the pincode field, it the field doesn't fit, suspension points doesn't appear
OC-3376: 'manage account' field is multiline, in preferences
OC-3381: (Fix bug) In preferences,  the 'instant upload via WIFI' field is multiline but only use two lines instead of three
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
Merge pull request #441 from owncloud/allow_multiline_checkbox_preferences_pr_395_with_develop

Allow multiline preferences, not just checkboxes
Merge branch 'develop' into regular_authentication_in_saml_server
[tx-robot] updated from transifex
Merge branch 'develop' into regular_authentication_in_saml_server
Add auth_unsupported_basic_auth string