Skip to content

fix: make ads translatable by barredterra [frappe] PR#25691

Bot Dokos requested to merge ft-pr-25691 into develop

From: https://github.com/frappe/frappe/pull/25691
Date: 2024-03-27 19:47:42+01:00

  • fix: make ads translatable


Diagnostics

Conflicts detected for source commit: 7426805425493660f3f9792d750a2e0326d3812a
- DU frappe/core/doctype/server_script/server_script_list.js


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-25691

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-25691

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports