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

M2 revisions #343

Merged
merged 8 commits into from
Oct 23, 2024
Merged

M2 revisions #343

merged 8 commits into from
Oct 23, 2024

Commits on Oct 23, 2024

  1. Merge conflict changes

    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1b2c0da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:turingschool/curriculum-site 

    Resolve merge conflict
    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d7049ca View commit details
    Browse the repository at this point in the history

  3. Add callouts for differences between Ruby and JS

    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    dd35593 View commit details
    Browse the repository at this point in the history

  4. Hide wireframe solution so it can be done together as a class

    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    2aa8209 View commit details
    Browse the repository at this point in the history

  5. Add to lists of semantic elements

    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    46e98e3 View commit details
    Browse the repository at this point in the history

  6. Add notes with Ruby differences and example of bracket notation using… 

    … a parameter
    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5fc5af0 View commit details
    Browse the repository at this point in the history

  7. Add your turn for function with param practice

    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    64fd4b6 View commit details
    Browse the repository at this point in the history

  8. Add conditional practice

    Heather Faerber committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    73129fe View commit details
    Browse the repository at this point in the history