Skip to content

[pull] main from joerick:main#43

Merged
pull[bot] merged 49 commits intoMu-L:mainfrom
joerick:main
Oct 14, 2024
Merged

[pull] main from joerick:main#43
pull[bot] merged 49 commits intoMu-L:mainfrom
joerick:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Oct 13, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

joerick added 30 commits April 26, 2024 16:53
# Conflicts:
#	html_renderer/package-lock.json
#	html_renderer/package.json
#	html_renderer/src/lib/Frame.svelte
#	html_renderer/src/lib/model/Frame.ts
#	html_renderer/tsconfig.node.json
#	pyinstrument/frame.py
#	pyinstrument/renderers/html_resources/app.css
#	pyinstrument/renderers/html_resources/app.js
rather than the rather arbitrary '/lib/' string match
@pull pull bot added the ⤵️ pull label Oct 13, 2024
@pull pull bot merged commit e362034 into Mu-L:main Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant