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.

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

[Gally]: master <- dev #50

Merged
merged 20 commits into from
Mar 16, 2019
Merged

[Gally]: master <- dev #50

merged 20 commits into from
Mar 16, 2019

Commits on Mar 15, 2019

  1. Configuration menu
    Copy the full SHA
    86cde4a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aee0edf View commit details
    Browse the repository at this point in the history
  3. amend: minor restruct

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    f1318f0 View commit details
    Browse the repository at this point in the history
  4. chore: added xml-merge strategy

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    0b95bb2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a0a1982 View commit details
    Browse the repository at this point in the history
  6. amend: improved xml-merge

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    3b94488 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5a44583 View commit details
    Browse the repository at this point in the history
  8. amend: added missing peer dep

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    a28555c View commit details
    Browse the repository at this point in the history
  9. amend: restruct

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    848054e View commit details
    Browse the repository at this point in the history
  10. amend: restruct

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    5791fde View commit details
    Browse the repository at this point in the history
  11. amend: simplified tests

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    e8c9923 View commit details
    Browse the repository at this point in the history
  12. amend: added more tests

    simlu committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    535bb4f View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2019

  1. fix: now deepmerging attributes

    simlu committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    2898005 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9167f77 View commit details
    Browse the repository at this point in the history
  3. amend: rename

    simlu committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    ba5ef56 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c1118fc View commit details
    Browse the repository at this point in the history
  5. amend: test rework

    simlu committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    ffa5d2a View commit details
    Browse the repository at this point in the history
  6. amend: rework

    simlu committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    6b705b3 View commit details
    Browse the repository at this point in the history
  7. amend: refactor

    simlu committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    210846d View commit details
    Browse the repository at this point in the history
  8. Merge pull request #48 from simlu/master

    feat: xml support
    simlu committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    414043d View commit details
    Browse the repository at this point in the history