appcues / appcues-android-sdk

The Appcues Android SDK
https://www.appcues.com/mobile
MIT License
10 stars 3 forks source link

Merging main (3.2.0) into sdk4 #625

Closed andretortolano closed 5 months ago

andretortolano commented 5 months ago

even though I merged its giving conflicts (i think this is because we did rebase before) so i changed some settings for the branch protection to allow me and james to force push (required after rebase) when needed.

will also keep commits in chronological order instead of the merge.