Skip to content

Recreating #34 #38

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

Merged
merged 11 commits into from
Jun 7, 2021
Merged

Recreating #34 #38

merged 11 commits into from
Jun 7, 2021

Conversation

evaherrada
Copy link
Collaborator

These commits got deleted due to me forgetting to pull before moving the branch to main.

@evaherrada evaherrada merged commit d50fe38 into adafruit:main Jun 7, 2021
@tannewt
Copy link
Member

tannewt commented Jun 7, 2021

We likely don't need this. We should use the original merge instead.

adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jun 12, 2021
Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI to 3.5.11 from 3.5.10:
  > Moved default branch to main
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#115 from Anton-2/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_Seesaw to 1.9.1 from 1.9.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_seesaw#74 from jposada202020/adding_new_example
  > Merge pull request adafruit/Adafruit_CircuitPython_seesaw#73 from kattni/rotary-neopixel-example
  > Merge pull request adafruit/Adafruit_CircuitPython_seesaw#71 from jposada202020/adding_new_guides

Updating https://github.com/adafruit/Adafruit_CircuitPython_SSD1325 to 1.2.5 from 1.2.4:
  > Moved default branch to main
  > Moved CI to Python 3.7
  > Added help text and problem matcher
  > Added pull request template
  > "Increase duplicate code check threshold "

Updating https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k to 1.10.3 from 1.10.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#38 from bjnhur/master
  > Redoing adafruit/Adafruit_CircuitPython_Wiznet5k#37

Updating https://github.com/adafruit/Adafruit_CircuitPython_BLE to 8.0.2 from 8.0.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_BLE#116 from alexwhittemore/master
  > Moved default branch to main
  > Added help text and problem matcher
  > Added pull request template

Updating https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad to 0.14.2 from 0.14.1:
  > Moved default branch to main
  > Moved CI to Python 3.7
  > Added help text and problem matcher
  > Added pull request template

Updating https://github.com/adafruit/Adafruit_CircuitPython_Simple_Text_Display to 1.0.1 from 1.0.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_Simple_Text_Display#1 from jposada202020/testing_readthedocs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants