Skip to content
This repository has been archived by the owner on Oct 30, 2023. It is now read-only.

Monospace Font fixing + Emoji consistency #269

Merged
merged 3 commits into from
Jun 3, 2022
Merged

Monospace Font fixing + Emoji consistency #269

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ab6f32
Monospace Font fixing + Emoji consistency
jdauphant Jun 2, 2022
ce8d894
Merge commit
celiacheff Jun 3, 2022
510ba1f
Merge branch 'develop' into font-fixing
celiacheff Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:tchapgouv/matrix-js-sdk#1a0775cba",
"matrix-react-sdk": "github:tchapgouv/matrix-react-sdk#5a117f2cc7",
"matrix-react-sdk": "github:tchapgouv/matrix-react-sdk#26ada09",
"modernizr": "^3.6.0",
"olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
"prop-types": "^15.6.2",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6125,9 +6125,9 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"

"matrix-react-sdk@github:tchapgouv/matrix-react-sdk#5a117f2cc7":
"matrix-react-sdk@github:tchapgouv/matrix-react-sdk#26ada09":
version "2.5.1-tchap"
resolved "https://codeload.github.com/tchapgouv/matrix-react-sdk/tar.gz/5a117f2cc75ace722ce9e46aa03172543f7cccd7"
resolved "https://codeload.github.com/tchapgouv/matrix-react-sdk/tar.gz/26ada092e807aff6790ae8c816993368f995021b"
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
Expand Down