Skip to content
Snippets Groups Projects
Select Git revision
  • nb-iot
  • main default protected
  • custom-modem-implementation
  • resilience-updates
  • host-OTA-update
  • tyrol-highschool-inday
  • develop
  • dev-electronics
  • ina219_host_for_solar_panel_checks
  • #58_attempted_workaround
  • termperature-chamber-tests
  • update_readmes
  • dev_hardware
  • hardware-dev
  • 50-sht85-over-serial-instead-of-espnow
  • espnow
  • NB-IOT-DREI-AT
  • prod-deployed-JUL-4-2023
  • Temperature-Chamber-Tests-April-7
  • temperature-chamber-test-feb
20 results
Blame Permalink
  • Zoe Michaela Dietmar Pfister's avatar
    9a1d6709
    Merge remote-tracking branch 'origin/develop' · 9a1d6709
    Zoe Michaela Dietmar Pfister authored 
    # Conflicts:
#	.gitignore
#	client/client_satellite/src/main.cpp
#	client/libs/LC7090203F/LC709203F.cpp
#	client/libs/LC7090203F/LC709203F.h
#	client/libs/deep_sleep/f_deep_sleep.cpp
#	client/libs/dr26_analogue/dr26.cpp
#	client/libs/dr26_analogue/dr26.hpp
#	client/libs/espnow/src/ESPNow.cpp
#	client/libs/espnow/src/Message.cpp
#	hardware/PCB/forte/forte.kicad_sch
    9a1d6709
    History
    Merge remote-tracking branch 'origin/develop'
    Zoe Michaela Dietmar Pfister authored 
    # Conflicts:
#	.gitignore
#	client/client_satellite/src/main.cpp
#	client/libs/LC7090203F/LC709203F.cpp
#	client/libs/LC7090203F/LC709203F.h
#	client/libs/deep_sleep/f_deep_sleep.cpp
#	client/libs/dr26_analogue/dr26.cpp
#	client/libs/dr26_analogue/dr26.hpp
#	client/libs/espnow/src/ESPNow.cpp
#	client/libs/espnow/src/Message.cpp
#	hardware/PCB/forte/forte.kicad_sch
Code owners
Assign users and groups as approvers for specific file changes. Learn more.