Files
bruno/packages
Mirko Golze f2bdf2eaf6 Merge branch 'main' into feature/proxy-global-and-collection
# Conflicts:
#	packages/bruno-app/src/components/Preferences/General/index.js
#	packages/bruno-app/src/components/Preferences/index.js
#	packages/bruno-app/src/providers/App/useIpcEvents.js
#	packages/bruno-app/src/providers/Preferences/index.js
#	packages/bruno-electron/src/index.js
#	packages/bruno-electron/src/ipc/collection.js
#	packages/bruno-electron/src/store/preferences.js
2023-10-15 17:06:39 +02:00
..
2023-10-15 16:40:50 +02:00