8000 Merge branch 'development' into gjacob24-contribution-of-style-of-sel… · DMPRoadmap/roadmap@e6810fe · GitHub
[go: up one dir, main page]
Skip to content

Commit e6810fe

Browse files
aaronskibaaaronskiba
authored
Merge branch 'development' into gjacob24-contribution-of-style-of-select-tags-and-plan-download-layout
2 parents a5fd512 + 3b44ec0 commit e6810fe

File tree

10 files changed

+2
-5159
lines changed

10 files changed

+2
-5159
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public/assets/*
1414
public/fonts/*
1515
public/images/*
1616
public/javascripts/*
17+
public/tinymce/skins/
1718
public/stylesheets/*
1819
public/system/*
1920
public/videos/*

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
- Adjustments to style of select tags and plan download layout [#3509](https://github.com/DMPRoadmap/roadmap/pull/3509)
44
- Fix failing eslint workflow / upgrade `actions/checkout` & `actions/setup-node` to v3 [#3503](https://github.com/DMPRoadmap/roadmap/pull/3503)
55
- Fix rendering of `confirm_merge` partial [#3515](https://github.com/DMPRoadmap/roadmap/pull/3515)
6+
- Remove Auto-Generated TinyMCE Skins and Add `public/tinymce/skins/` to `.gitignore` [#3466](https://github.com/DMPRoadmap/roadmap/pull/3466)
67

78
## v5.0.0
89

0 commit comments

Comments
 (0)
0