Fix bad merge

Automated cherry pick of mattermost#3927 (mattermost#3928)

* Bump app build number to 268

* Update server version in Android description

Co-authored-by: Miguel Alatzar <[email protected]>

Bump app version number to 1.27.1 (mattermost#3833)

Co-authored-by: Miguel Alatzar <[email protected]>

Automated cherry pick of mattermost#3809 (mattermost#3810)

* Fix circleCI for unsigned builds

* Bump app build number to 259

* Update fastlane

Co-authored-by: Elias Nahum <[email protected]>

Bump app build number to 258 (mattermost#3775)

Bump app build number to 256 (mattermost#3750)

Bump app build number to 253 (mattermost#3714)

Bump app build number to 247 (mattermost#3593)

Mobile app v1.25.0

Bump app build number to 239 (mattermost#3422)