[wp-trac] [WordPress Trac] #40794: WordPress needs a privacy policy
WordPress Trac
noreply at wordpress.org
Wed Jul 19 21:19:13 UTC 2017
#40794: WordPress needs a privacy policy
------------------------------+-----------------------
Reporter: johnbillion | Owner: jnylen0
Type: enhancement | Status: assigned
Priority: normal | Milestone: 4.8.1
Component: Help/About | Version:
Severity: normal | Resolution:
Keywords: has-patch commit | Focuses:
------------------------------+-----------------------
Changes (by jnylen0):
* keywords: has-patch => has-patch commit
Comment:
Per Slack discussion, added a separate patch for trunk:
- [attachment:40794.3.trunk.diff]: `trunk`
- [attachment:40794.3.diff]: `4.8` branch
The `trunk` patch is very similar to [attachment:privacy.diff] but with
the string change from @Clorith and the cleanup of a couple of things that
were copied over from the Credits page.
Regarding `svn` and the merge of these two patches:
> westonruter [11:13 PM]
> For the Custom HTML widget I committed the separate file in `trunk`. And
then for the 4.8 branch I did `svn merge` as normal, but before
committing, I removed the newly added file and amended it on the existing
file. In that way, the merge info is retained.
--
Ticket URL: <https://core.trac.wordpress.org/ticket/40794#comment:18>
WordPress Trac <https://core.trac.wordpress.org/>
WordPress publishing platform
More information about the wp-trac
mailing list