Skip to content
This repository has been archived by the owner on Aug 23, 2024. It is now read-only.

update branch #43

Merged
merged 46 commits into from
Jun 28, 2024
Merged

update branch #43

merged 46 commits into from
Jun 28, 2024

Conversation

dj1ch
Copy link
Owner

@dj1ch dj1ch commented Jun 28, 2024

No description provided.

ATOMNFT added 30 commits June 8, 2024 17:18
commit f684e94
Merge: 34f3351 6efa522
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:24:06 2024 -0500

    Merge branch 'development' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32 into development

commit 34f3351
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:04:08 2024 -0500

    Cleaning

commit 388c7bf
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:03:06 2024 -0500

    Cleaning

commit 6efa522
Merge: 6cd0afc 1554331
Author: dj1ch <tg.1ch0712@gmail.com>
Date:   Thu Jun 27 07:24:54 2024 -0700

    Merge pull request #40 from dj1ch/main

    merge pr
commit 3275a8f
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:31:16 2024 -0500

    Removed junk

commit 65cf381
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:30:44 2024 -0500

    Repo repair

commit ac536a7
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:29:53 2024 -0500

    Squashed commit of the following:

    commit f684e94
    Merge: 34f3351 6efa522
    Author: ATOMNFT <itsmestener@gmail.com>
    Date:   Fri Jun 28 07:24:06 2024 -0500

        Merge branch 'development' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32 into development

    commit 34f3351
    Author: ATOMNFT <itsmestener@gmail.com>
    Date:   Fri Jun 28 07:04:08 2024 -0500

        Cleaning

    commit 388c7bf
    Author: ATOMNFT <itsmestener@gmail.com>
    Date:   Fri Jun 28 07:03:06 2024 -0500

        Cleaning

    commit 6efa522
    Merge: 6cd0afc 1554331
    Author: dj1ch <tg.1ch0712@gmail.com>
    Date:   Thu Jun 27 07:24:54 2024 -0700

        Merge pull request #40 from dj1ch/main

        merge pr

commit 46f9ec7
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:27:54 2024 -0500

    Repo Repair

commit 500266f
Merge: 5772c99 1554331
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:17:00 2024 -0500

    Merge branch 'main' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32

commit 5772c99
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:15:35 2024 -0500

    Cleaning

commit efc2333
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:09:01 2024 -0500

    Organizing

commit edc1fa5
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:07:45 2024 -0500

    Update README.md

commit f41b43f
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:05:40 2024 -0500

    Added user_setup files

commit 0d829c7
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Fri Jun 28 07:04:59 2024 -0500

    Cleaning

commit 5920700
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Thu Jun 27 08:57:32 2024 -0500

    Fixed delays & merge errors

commit 1ada9bf
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Wed Jun 26 15:47:40 2024 -0500

    Updated User_setup files

commit 325f0d2
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Wed Jun 26 14:18:34 2024 -0500

    Added updated files

commit 1fcce62
Merge: 1c7abf0 4b19e1f
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Wed Jun 26 14:15:23 2024 -0500

    Merge branch 'main' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32

commit 1c7abf0
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Wed Jun 12 11:37:01 2024 -0500

    Update INSTALL.md

commit f8ed260
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Tue Jun 11 14:08:34 2024 -0500

    Apply restyled patch

commit 3f280ce
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Mon Jun 10 23:59:53 2024 -0500

    Added t-display user_setup

commit 67cfbcd
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Mon Jun 10 09:45:41 2024 -0500

    Apply restyled patch

commit b8b37d3
Merge: f971a2d a37f28d
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Mon Jun 10 09:35:38 2024 -0500

    Merge branch 'main' into main

commit f971a2d
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Mon Jun 10 09:33:53 2024 -0500

    Apply restyled patch

commit 25efa66
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Mon Jun 10 08:56:53 2024 -0500

    Removed zip file

commit d1178d0
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Sat Jun 8 21:06:29 2024 -0500

    Update INSTALL.md

commit d057d1b
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Sat Jun 8 17:21:20 2024 -0500

    Update README.md

commit 550180a
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Sat Jun 8 17:19:32 2024 -0500

    Added new files

commit a64b965
Author: ATOMNFT <itsmestener@gmail.com>
Date:   Sat Jun 8 17:18:30 2024 -0500

    Added User_setup files
@dj1ch dj1ch merged commit 9a278d4 into development Jun 28, 2024
2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants