564-Update to upstream v6.301
Description
This MR resolve the merge conflict occurred when update with upstream job triggered for v6.301 update
Issue(s)
Test environment
Download apk from pipeline
Test procedures
Check basic /e/OS Mail's functionality
Technical details
Fix conflict on strings.xml files & build.gradle files dependency mismatch conflicts.
Screenshots
Check list
-
Self review -
Test procedure explained -
Tested on fresh install -
Tested applied as an update -
License -
Internal documentation -
User documentation