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

Updated Kyocera #4475

Merged
merged 6 commits into from
Jan 3, 2021
Merged

Updated Kyocera #4475

merged 6 commits into from
Jan 3, 2021

Commits on Dec 26, 2020

  1. Updated Kyocera

    Adam committed Dec 26, 2020
    Configuration menu
    Copy the full SHA
    4936bca View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2021

  1. Rebuilt from source

    Adam Rusted committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    7f97b2f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into Kyocera

    Adam Rusted committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    809da6d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/simple-icons/simple-icons … 

    …into Kyocera

� Conflicts:
�	.svglint-ignored.json
    @fbernhart
    fbernhart committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    fa85ed5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'adamrusted/Kyocera' into Kyocera 

    # Conflicts:
#	.svglint-ignored.json
    @fbernhart
    fbernhart committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    7aa8ed9 View commit details
    Browse the repository at this point in the history

  5. Fixed merging conflict

    @fbernhart
    fbernhart committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    4ed4b9e View commit details
    Browse the repository at this point in the history