Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Merathilis committed Oct 30, 2023
2 parents bf46cc3 + 1ea4c57 commit b7b5c4b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
### Changes ###

* Fixed an error with Immersion Skin
* Added an scaling option for some frames, disabled by default: Misc -> Scale
* Fixed an oopsie in the BagSync Skin
3 changes: 1 addition & 2 deletions ElvUI_MerathilisUI/Core/Changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR

local ChangeLogData = {
"Changes:",
"• Fixed an error with Immersion Skin",
"• Added an scaling option for some frames, disabled by default: Misc -> Scale",
"• Fixed an oopsie in the BagSync Skin",

-- "• ''",

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<img src="https://raw.githubusercontent.com/Merathilis/ElvUI_MerathilisUI/development/m4.png"/><br>
<img src="https://img.shields.io/badge/ElvUI-13.46-blue.svg?longCache=true&style=for-the-badge"/>
<img src="https://img.shields.io/badge/Version-5.92-orange.svg?longCache=true&style=for-the-badge"/>
<img src="https://img.shields.io/badge/Version-5.93-orange.svg?longCache=true&style=for-the-badge"/>
</div>

---
Expand Down

0 comments on commit b7b5c4b

Please sign in to comment.