Merge remote-tracking branch 'farmOS.org/7.x-1.x' into 7.x-1.x (see commit details for more info)

Browse Source

Merge made by the 'ours' strategy. No files from farmOS.org/7.x-1.x are
preserved by this commit.

We are doing this to preserve the history of the legacy farmOS.org
repository in the core farmOS repository, so that we can archive the old
farmOS.org repository and replace it with a new one. In the 1.x lifecycle,
we put farmOS documentation in the farmOS.org repository, but in 2.x we
are including docs in the farmOS repository itself, so all history will
be in one place moving forward. The new farmOS.org repository will only
have general community content, and will aggregate documentation from the
farmOS repository (and others).

...

This commit is contained in:

Michael Stenta 2021-12-21 12:58:46 -05:00

parent d07b709d94 e6bb97be0f

commit d16a63a241

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available