pleroma-elixir-libraries/majic
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Merge stable into develop #18

Merged
lambadalambda merged 19 commits from merge/stable-into-develop into develop 2026-05-13 13:59:15 +00:00
Conversation 0 Commits 19 Files changed 5 +19 -6
lambadalambda commented 2026-05-13 13:58:12 +00:00
Owner
Copy link

Summary

  • Merge the stable branch into develop to reconcile version history
  • Brings in: mime 1.x downgrade, exclude_patterns: ["priv"] in package config, pool.ex variable renaming, and 1.1.0/1.1.1 changelog entries
  • Keeps develop's version at 1.1.0 (will be bumped to 1.2.0 in a separate PR)
## Summary - Merge the `stable` branch into `develop` to reconcile version history - Brings in: mime 1.x downgrade, `exclude_patterns: ["priv"]` in package config, pool.ex variable renaming, and 1.1.0/1.1.1 changelog entries - Keeps develop's version at 1.1.0 (will be bumped to 1.2.0 in a separate PR)
Release 1.1.0

See merge request pleroma/elixir-libraries/majic!6
Release 1.1.1

See merge request pleroma/elixir-libraries/majic!9
Merge branch 'stable' into merge/stable-into-develop
All checks were successful
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/unit-testing Pipeline was successful
Details
0f23c16ec3
 
# Conflicts:
#	CHANGELOG.md
#	mix.exs
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma-elixir-libraries/majic!18
No description provided.