-
Jan Čermák authored
Conflicts: configs/config-turris-nand feeds.conf.default package/kernel/mac80211/Makefile package/libs/libevent2/Makefile package/network/utils/uqmi/Makefile package/system/ca-certificates/Makefile
20c796bd
Conflicts: configs/config-turris-nand feeds.conf.default package/kernel/mac80211/Makefile package/libs/libevent2/Makefile package/network/utils/uqmi/Makefile package/system/ca-certificates/Makefile