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

joint rails - enoch attachment classes compatibility - Variant A #1184

Merged
merged 6 commits into from
Jul 27, 2019
Merged

joint rails - enoch attachment classes compatibility - Variant A #1184

merged 6 commits into from
Jul 27, 2019

Commits on Jul 26, 2019

  1. joint rails - enoch attachment classes compatibility

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    c75104b View commit details
    Browse the repository at this point in the history

  2. manual merge

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    cc983f9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into enoch… 

    …-jr-compat1
    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    a6370b0 View commit details
    Browse the repository at this point in the history

  4. don't overwrite vanilla magazine base classes

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    e0d5606 View commit details
    Browse the repository at this point in the history

  5. don't overwrite vanilla magazine base classes

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    6ee185f View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2019

  1. Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into enoch… 

    …-jr-compat1
    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    35f39a8 View commit details
    Browse the repository at this point in the history