Skip to content

Commit

Permalink
Merge pull request #1212 from basecamp/1.3.5
Browse files Browse the repository at this point in the history
Bump to v1.3.5
  • Loading branch information
djmb authored Dec 11, 2024
2 parents 48358ae + b77200f commit 36d495a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion assets/trix/banner/index.txt.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Trix <%= depend_on_asset("trix/VERSION").to_s.chomp %>
Copyright © <%= Time.now.year %> Basecamp, LLC
Copyright © <%= Time.now.year %> 37signals, LLC
http://trix-editor.org/
6 changes: 3 additions & 3 deletions dist/trix-core.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/trix.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@charset "UTF-8";
/*
Trix 1.3.4
Copyright © 2024 Basecamp, LLC
Trix 1.3.5
Copyright © 2024 37signals, LLC
http://trix-editor.org/*/
trix-editor {
border: 1px solid #bbb;
Expand Down
6 changes: 3 additions & 3 deletions dist/trix.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/trix/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.4
1.3.5

0 comments on commit 36d495a

Please sign in to comment.