Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conflicts #298

Open
wants to merge 10 commits into
base: 14.0
Choose a base branch
from
Open

Fix conflicts #298

wants to merge 10 commits into from

Commits on Feb 11, 2022

  1. [FIX] error language undefine

    kpo committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    914596c View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2022

  1. Merge branch 'CybroOdoo:14.0' into 14.0

    @efairon
    efairon authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    38d889e View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Merge branch 'CybroOdoo:14.0' into 14.0

    @efairon
    efairon authored Mar 15, 2022
    Configuration menu
    Copy the full SHA
    994a70d View commit details
    Browse the repository at this point in the history

Commits on May 4, 2022

  1. [FIX] website, author

    kpo committed May 4, 2022
    Configuration menu
    Copy the full SHA
    5375417 View commit details
    Browse the repository at this point in the history

  2. [FIX] author

    kpo committed May 4, 2022
    Configuration menu
    Copy the full SHA
    c308302 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. Merge branch 'CybroOdoo:14.0' into 14.0

    @efairon
    efairon authored May 6, 2022
    Configuration menu
    Copy the full SHA
    c134b8b View commit details
    Browse the repository at this point in the history

Commits on May 27, 2022

  1. Merge branch 'CybroOdoo:14.0' into 14.0

    @efairon
    efairon authored May 27, 2022
    Configuration menu
    Copy the full SHA
    a3df8ce View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2022

  1. Merge branch 'CybroOdoo:14.0' into 14.0

    @efairon
    efairon authored Jul 6, 2022
    Configuration menu
    Copy the full SHA
    dded021 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge branch '14.0' into 14.0

    @kpofw
    kpofw authored Jan 2, 2024
    Configuration menu
    Copy the full SHA
    2e23285 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge branch 'CybroOdoo:14.0' into 14.0

    @efairon
    efairon authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    60a13ea View commit details
    Browse the repository at this point in the history